From e97edec1902efe19ed95a50e9b25150408837004 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 1 Mar 2025 18:39:52 +0100
Subject: [PATCH] cmake: support find_package(SDL3_mixer) using SDL3_mixer from
a build directory
---
CMakeLists.txt | 2 ++
cmake/SDL3_mixerConfig.cmake.in | 3 +++
external/ogg | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 136ff8e5..f6e5d174 100644
--- 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
index c8d920e5..a4aa7e6b 100644
--- 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
index 7231a568..0eb25184 160000
--- a/external/ogg
+++ b/external/ogg
@@ -1 +1 @@
-Subproject commit 7231a5687231bad3eb778399ac08b690589db8d4
+Subproject commit 0eb25184a55df8ec6f1e388d93537b93adf2c61c