cmake: support find_package(SDL3_mixer) using SDL3_mixer from a build directory

madebr · madebr · commit e97edec1902e · 2025-03-01T19:07:06.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1184,6 +1184,8 @@ if(SDLMIXER_INSTALL)
         COMPONENT devel
     )
 
+    export(TARGETS ${sdl3_mixer_target_name} ${INSTALL_EXTRA_TARGETS} NAMESPACE "SDL3_mixer::" FILE "${sdl3_mixer_target_name}-targets.cmake")
+
     if(SDLMIXER_RELOCATABLE)
       file(RELATIVE_PATH SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/${SDLMIXER_PKGCONFIG_INSTALLDIR}" "${CMAKE_INSTALL_PREFIX}")
       string(REGEX REPLACE "[/]+$" "" SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")
diff --git a/cmake/SDL3_mixerConfig.cmake.in b/cmake/SDL3_mixerConfig.cmake.in
@@ -154,5 +154,8 @@ if(NOT TARGET SDL3_mixer::SDL3_mixer)
     endif()
 endif()
 
+if(NOT SDL3_mixer_COMPONENTS AND NOT TARGET SDL3_mixer::SDL3_mixer-shared AND NOT TARGET SDL3_mixer::SDL3_mixer-static)
+    set(SDL3_image_FOUND FALSE)
+endif()
 @PACKAGE_INIT@
 check_required_components(SDL3_mixer)
diff --git a/external/ogg b/external/ogg
@@ -1 +1 @@
-Subproject commit 7231a5687231bad3eb778399ac08b690589db8d4
+Subproject commit 0eb25184a55df8ec6f1e388d93537b93adf2c61c

Original file line number	Diff line number	Diff line change
`@@ -1184,6 +1184,8 @@ if(SDLMIXER_INSTALL)`
`1184`	`1184`	`COMPONENT devel`
`1185`	`1185`	`)`
`1186`	`1186`
	`1187`	`+ export(TARGETS ${sdl3_mixer_target_name} ${INSTALL_EXTRA_TARGETS} NAMESPACE "SDL3_mixer::" FILE "${sdl3_mixer_target_name}-targets.cmake")`
	`1188`	`+`
`1187`	`1189`	`if(SDLMIXER_RELOCATABLE)`
`1188`	`1190`	`file(RELATIVE_PATH SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/${SDLMIXER_PKGCONFIG_INSTALLDIR}" "${CMAKE_INSTALL_PREFIX}")`
`1189`	`1191`	`string(REGEX REPLACE "[/]+$" "" SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG "${SDL_PATH_PREFIX_RELATIVE_TO_PKGCONFIG}")`