From 489aae32386c697a74ee68a7dfe0b0dd27946733 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 14 Jan 2023 17:26:16 +0100
Subject: [PATCH] cmake: use MPG123::libmpg123 target + lowercase
Findmpg123.cmake
---
CMakeLists.txt | 20 ++++++++++----------
cmake/FindMPG123.cmake | 32 --------------------------------
cmake/Findmpg123.cmake | 32 ++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 42 deletions(-)
delete mode 100644 cmake/FindMPG123.cmake
create mode 100644 cmake/Findmpg123.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec3d9dbf..cae4beba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -700,8 +700,8 @@ if(SDL2MIXER_MP3_MPG123)
set(BUILD_PROGRAMS OFF CACHE BOOL "Build programs")
set(BUILD_SHARED_LIBS "${SDL2MIXER_MP3_MPG123_SHARED}")
add_subdirectory(external/mpg123/ports/cmake EXCLUDE_FROM_ALL)
- if(NOT TARGET MPG123::mpg123)
- add_library(MPG123::mpg123 ALIAS libmpg123)
+ if(NOT TARGET MPG123::libmpg123)
+ add_library(MPG123::libmpg123 ALIAS libmpg123)
endif()
if(SDL2MIXER_MP3_MPG123_SHARED OR NOT SDL2MIXER_BUILD_SHARED_LIBS)
list(APPEND INSTALL_EXTRA_TARGETS libmpg123)
@@ -711,25 +711,25 @@ if(SDL2MIXER_MP3_MPG123)
endif()
else()
message(STATUS "Using system mpg123")
- find_package(MPG123 REQUIRED)
+ find_package(mpg123 REQUIRED)
if(NOT SDL2MIXER_MP3_MPG123_SHARED)
list(APPEND PC_REQUIRES libmpg123)
endif()
endif()
if(SDL2MIXER_MP3_MPG123_SHARED)
target_include_directories(SDL2_mixer PRIVATE
- $<TARGET_PROPERTY:MPG123::mpg123,INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:MPG123::mpg123,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:MPG123::mpg123,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:MPG123::libmpg123,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:MPG123::libmpg123,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:MPG123::libmpg123,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
)
- target_get_dynamic_library(dynamic_mpg123 MPG123::mpg123)
+ target_get_dynamic_library(dynamic_mpg123 MPG123::libmpg123)
message(STATUS "Dynamic mpg123}: ${dynamic_mpg123}")
target_compile_definitions(SDL2_mixer PRIVATE "MPG123_DYNAMIC=\"${dynamic_mpg123}\"")
if(SDL2MIXER_VENDORED)
- add_dependencies(SDL2_mixer MPG123::mpg123)
+ add_dependencies(SDL2_mixer MPG123::libmpg123)
endif()
else()
- target_link_libraries(SDL2_mixer PRIVATE MPG123::mpg123)
+ target_link_libraries(SDL2_mixer PRIVATE MPG123::libmpg123)
endif()
endif()
@@ -897,7 +897,7 @@ if(SDL2MIXER_INSTALL)
cmake/Findlibxmp.cmake
cmake/Findlibxmp-lite.cmake
cmake/Findmodplug.cmake
- cmake/FindMPG123.cmake
+ cmake/Findmpg123.cmake
cmake/FindOpusFile.cmake
cmake/Findtremor.cmake
cmake/FindVorbis.cmake
diff --git a/cmake/FindMPG123.cmake b/cmake/FindMPG123.cmake
deleted file mode 100644
index f850d4f3..00000000
--- a/cmake/FindMPG123.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_library(MPG123_LIBRARY
- NAMES mpg123
-)
-
-find_path(MPG123_INCLUDE_PATH
- NAMES mpg123.h
-)
-
-set(MPG123_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of mpg123")
-
-set(MPG123_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of mpg123")
-
-set(MPG123_LINK_FLAGS "" CACHE STRING "Extra link flags of mpg123")
-
-find_package_handle_standard_args(MPG123
- REQUIRED_VARS MPG123_LIBRARY MPG123_INCLUDE_PATH
-)
-
-if (MPG123_FOUND)
- if (NOT TARGET MPG123::mpg123)
- add_library(MPG123::mpg123 UNKNOWN IMPORTED)
- set_target_properties(MPG123::mpg123 PROPERTIES
- IMPORTED_LOCATION "${MPG123_LIBRARY}"
- INTERFACE_INCLUDE_DIRECTORIES "${MPG123_INCLUDE_PATH}"
- INTERFACE_COMPILE_OPTIONS "${MPG123_COMPILE_OPTIONS}"
- INTERFACE_LINK_LIBRARIES "${MPG123_LINK_LIBRARIES}"
- INTERFACE_LINK_FLAGS "${MPG123_LINK_FLAGS}"
- )
- endif()
-endif()
diff --git a/cmake/Findmpg123.cmake b/cmake/Findmpg123.cmake
new file mode 100644
index 00000000..3e75bac3
--- /dev/null
+++ b/cmake/Findmpg123.cmake
@@ -0,0 +1,32 @@
+include(FindPackageHandleStandardArgs)
+
+find_library(mpg123_LIBRARY
+ NAMES mpg123
+)
+
+find_path(mpg123_INCLUDE_PATH
+ NAMES mpg123.h
+)
+
+set(mpg123_COMPILE_OPTIONS "" CACHE STRING "Extra compile options of mpg123")
+
+set(mpg123_LINK_LIBRARIES "" CACHE STRING "Extra link libraries of mpg123")
+
+set(mpg123_LINK_FLAGS "" CACHE STRING "Extra link flags of mpg123")
+
+find_package_handle_standard_args(mpg123
+ REQUIRED_VARS mpg123_LIBRARY mpg123_INCLUDE_PATH
+)
+
+if(mpg123_FOUND)
+ if(NOT TARGET MPG123::libmpg123)
+ add_library(MPG123::libmpg123 UNKNOWN IMPORTED)
+ set_target_properties(MPG123::libmpg123 PROPERTIES
+ IMPORTED_LOCATION "${mpg123_LIBRARY}"
+ INTERFACE_INCLUDE_DIRECTORIES "${mpg123_INCLUDE_PATH}"
+ INTERFACE_COMPILE_OPTIONS "${mpg123_COMPILE_OPTIONS}"
+ INTERFACE_LINK_LIBRARIES "${mpg123_LINK_LIBRARIES}"
+ INTERFACE_LINK_FLAGS "${mpg123_LINK_FLAGS}"
+ )
+ endif()
+endif()