From 9141b01322cdc63a17effaf5ff7b619a7c771247 Mon Sep 17 00:00:00 2001
From: Pierre Wendling <[EMAIL REDACTED]>
Date: Tue, 7 Mar 2023 15:52:34 -0500
Subject: [PATCH] CMake: Match upstream's target names.
FluidSynth uses `FluidSynth::libfluidsynth` for the library target.
Fix MPG123 and OpusFile target name casing in the exported config.
---
CMakeLists.txt | 12 ++++++------
cmake/FindFluidSynth.cmake | 6 +++---
cmake/SDL3_mixerConfig.cmake.in | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 583e1bb2..fd685a3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -786,18 +786,18 @@ if(SDL3MIXER_MIDI_FLUIDSYNTH)
endif()
if(SDL3MIXER_MIDI_FLUIDSYNTH_SHARED)
target_include_directories(SDL3_mixer PRIVATE
- $<TARGET_PROPERTY:FluidSynth::FluidSynth,INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:FluidSynth::FluidSynth,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:FluidSynth::FluidSynth,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:FluidSynth::libfluidsynth,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:FluidSynth::libfluidsynth,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:FluidSynth::libfluidsynth,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
)
- target_get_dynamic_library(dynamic_fluidsynth FluidSynth::FluidSynth)
+ target_get_dynamic_library(dynamic_fluidsynth FluidSynth::libfluidsynth)
message(STATUS "Dynamic fluidsynth: ${dynamic_fluidsynth}")
target_compile_definitions(SDL3_mixer PRIVATE "FLUIDSYNTH_DYNAMIC=\"${dynamic_fluidsynth}\"")
if(SDL3MIXER_VENDORED)
- add_dependencies(SDL3_mixer FluidSynth::FluidSynth)
+ add_dependencies(SDL3_mixer FluidSynth::libfluidsynth)
endif()
else()
- target_link_libraries(SDL3_mixer PRIVATE FluidSynth::FluidSynth)
+ target_link_libraries(SDL3_mixer PRIVATE FluidSynth::libfluidsynth)
endif()
endif()
diff --git a/cmake/FindFluidSynth.cmake b/cmake/FindFluidSynth.cmake
index 435840b6..1f74da05 100644
--- a/cmake/FindFluidSynth.cmake
+++ b/cmake/FindFluidSynth.cmake
@@ -19,9 +19,9 @@ find_package_handle_standard_args(FluidSynth
)
if(FluidSynth_FOUND)
- if(NOT TARGET FluidSynth::FluidSynth)
- add_library(FluidSynth::FluidSynth UNKNOWN IMPORTED)
- set_target_properties(FluidSynth::FluidSynth PROPERTIES
+ if(NOT TARGET FluidSynth::libfluidsynth)
+ add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED)
+ set_target_properties(FluidSynth::libfluidsynth PROPERTIES
IMPORTED_LOCATION "${FluidSynth_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${FluidSynth_INCLUDE_PATH}"
INTERFACE_COMPILE_OPTIONS "${FluidSynth_COMPILE_OPTIONS}"
diff --git a/cmake/SDL3_mixerConfig.cmake.in b/cmake/SDL3_mixerConfig.cmake.in
index f8969ac1..534eb0c0 100644
--- a/cmake/SDL3_mixerConfig.cmake.in
+++ b/cmake/SDL3_mixerConfig.cmake.in
@@ -80,10 +80,10 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3_mixer-static-targets.cmake")
endif()
if(SDL3MIXER_MP3_MPG123 AND NOT SDL3MIXER_VENDORED AND NOT TARGET MPG123::mpg123)
- find_dependency(MPG123)
+ find_dependency(mpg123)
endif()
- if(SDL3MIXER_MIDI_FLUIDSYNTH AND NOT SDL3MIXER_VENDORED AND NOT TARGET FluidSynth::FluidSynth)
+ if(SDL3MIXER_MIDI_FLUIDSYNTH AND NOT SDL3MIXER_VENDORED AND NOT TARGET FluidSynth::libfluidsynth)
find_dependency(FluidSynth)
endif()
@@ -95,7 +95,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3_mixer-static-targets.cmake")
find_dependency(Vorbis)
endif()
- if(SDL3MIXER_OPUS AND NOT SDL3MIXER_VENDORED AND NOT TARGET opusfile::opusfile)
+ if(SDL3MIXER_OPUS AND NOT SDL3MIXER_VENDORED AND NOT TARGET OpusFile::opusfile)
find_dependency(OpusFile)
endif()