From e483f6598cbb153ef31b566fca901536914dc756 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Mon, 26 Sep 2022 17:43:03 +0200
Subject: [PATCH] cmake: make FindVorbis.cmake compatible with upstream's
VorbisConfig.cmake
---
CMakeLists.txt | 20 ++++++++++----------
cmake/FindVorbis.cmake | 32 ++++++++++++++++++++++++++++++++
cmake/Findvorbisfile.cmake | 32 --------------------------------
3 files changed, 42 insertions(+), 42 deletions(-)
create mode 100644 cmake/FindVorbis.cmake
delete mode 100644 cmake/Findvorbisfile.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff31f618..be8a25c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,8 +458,8 @@ if(SDL2MIXER_VORBIS_VORBISFILE)
set(BUILD_SHARED_LIBS ${SDL2MIXER_VORBIS_VORBISFILE_SHARED})
sdl_check_project_in_subfolder(external/vorbis vorbisfile SDL2MIXER_VENDORED)
add_subdirectory(external/vorbis EXCLUDE_FROM_ALL)
- if(NOT TARGET vorbisfile::vorbisfile)
- add_library(vorbisfile::vorbisfile ALIAS vorbisfile)
+ if(NOT TARGET Vorbis::vorbisfile)
+ add_library(Vorbis::vorbisfile ALIAS vorbisfile)
endif()
if(SDL2MIXER_VORBIS_VORBISFILE_SHARED OR NOT SDL2MIXER_BUILD_SHARED_LIBS)
list(APPEND INSTALL_EXTRA_TARGETS vorbis vorbisfile)
@@ -469,25 +469,25 @@ if(SDL2MIXER_VORBIS_VORBISFILE)
endif()
else()
message(STATUS "Using system vorbisfile")
- find_package(vorbisfile REQUIRED)
+ find_package(Vorbis REQUIRED)
if(NOT SDL2MIXER_VORBIS_VORBISFILE_SHARED)
list(APPEND PC_REQUIRES vorbisfile)
endif()
endif()
if(SDL2MIXER_VORBIS_VORBISFILE_SHARED)
target_include_directories(SDL2_mixer PRIVATE
- $<TARGET_PROPERTY:vorbisfile::vorbisfile,INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:vorbisfile::vorbisfile,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:vorbisfile::vorbisfile,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Vorbis::vorbisfile,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Vorbis::vorbisfile,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Vorbis::vorbisfile,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
)
- target_get_dynamic_library(dynamic_vorbisfile vorbisfile::vorbisfile)
+ target_get_dynamic_library(dynamic_vorbisfile Vorbis::vorbisfile)
message(STATUS "Dynamic vorbisfile: ${dynamic_vorbisfile}")
target_compile_definitions(SDL2_mixer PRIVATE "OGG_DYNAMIC=\"${dynamic_vorbisfile}\"")
if(SDL2MIXER_VENDORED)
- add_dependencies(SDL2_mixer vorbisfile::vorbisfile)
+ add_dependencies(SDL2_mixer Vorbis::vorbisfile)
endif()
else()
- target_link_libraries(SDL2_mixer PRIVATE vorbisfile::vorbisfile)
+ target_link_libraries(SDL2_mixer PRIVATE Vorbis::vorbisfile)
endif()
endif()
@@ -807,7 +807,7 @@ if(SDL2MIXER_INSTALL)
cmake/Findmodplug.cmake
cmake/Findopusfile.cmake
cmake/FindMPG123.cmake
- cmake/Findvorbisfile.cmake
+ cmake/FindVorbis.cmake
cmake/Findtremor.cmake
DESTINATION "${PKG_PREFIX}"
COMPONENT devel
diff --git a/cmake/FindVorbis.cmake b/cmake/FindVorbis.cmake
new file mode 100644
index 00000000..cd6c7909
--- /dev/null
+++ b/cmake/FindVorbis.cmake
@@ -0,0 +1,32 @@
+include(FindPackageHandleStandardArgs)
+
+find_library(Vorbis_vorbisfile_LIBRARY
+ NAMES vorbisfile
+)
+
+set(Vorbis_vorbisfile_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of vorbisfile")
+
+set(Vorbis_vorbisfile_LINK_FLAGS "" CACHE STRING "Extra link flags of vorbisfile")
+
+find_path(Vorbis_vorbisfile_INCLUDE_PATH
+ NAMES vorbis/vorbisfile.h
+)
+
+find_package_handle_standard_args(Vorbis
+ REQUIRED_VARS Vorbis_vorbisfile_LIBRARY Vorbis_vorbisfile_INCLUDE_PATH
+)
+
+if (Vorbis_FOUND)
+ if (NOT TARGET Vorbis::vorbisfile)
+ add_library(Vorbis::vorbisfile UNKNOWN IMPORTED)
+ set_target_properties(Vorbis::vorbisfile PROPERTIES
+ IMPORTED_LOCATION "${Vorbis_vorbisfile_LIBRARY}"
+ INTERFACE_INCLUDE_DIRECTORIES "${Vorbis_vorbisfile_INCLUDE_PATH}"
+ INTERFACE_COMPILE_OPTIONS "${Vorbis_vorbisfile_COMPILE_OPTIONS}"
+ INTERFACE_LINK_LIBRARIES "${Vorbis_vorbisfile_LINK_LIBRARIES}"
+ INTERFACE_LINK_FLAGS "${Vorbis_vorbisfile_LINK_FLAGS}"
+ )
+ endif()
+endif()
diff --git a/cmake/Findvorbisfile.cmake b/cmake/Findvorbisfile.cmake
deleted file mode 100644
index 83a47603..00000000
--- a/cmake/Findvorbisfile.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_library(vorbisfile_LIBRARY
- NAMES vorbisfile
-)
-
-set(vorbisfile_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of vorbisfile")
-
-set(vorbisfile_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of vorbisfile")
-
-set(vorbisfile_LINK_FLAGS "" CACHE STRING "Extra link flags of vorbisfile")
-
-find_path(vorbisfile_INCLUDE_PATH
- NAMES vorbis/vorbisfile.h
-)
-
-find_package_handle_standard_args(vorbisfile
- REQUIRED_VARS vorbisfile_LIBRARY vorbisfile_INCLUDE_PATH
-)
-
-if (vorbisfile_FOUND)
- if (NOT TARGET vorbisfile::vorbisfile)
- add_library(vorbisfile::vorbisfile UNKNOWN IMPORTED)
- set_target_properties(vorbisfile::vorbisfile PROPERTIES
- IMPORTED_LOCATION "${vorbisfile_LIBRARY}"
- INTERFACE_INCLUDE_DIRECTORIES "${vorbisfile_INCLUDE_PATH}"
- INTERFACE_COMPILE_OPTIONS "${vorbisfile_COMPILE_OPTIONS}"
- INTERFACE_LINK_LIBRARIES "${vorbisfile_LINK_LIBRARIES}"
- INTERFACE_LINK_FLAGS "${vorbisfile_LINK_FLAGS}"
- )
- endif()
-endif()