12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273 |
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index b1b49e9..ae8ebec 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -174,7 +174,7 @@ set_package_properties (FLAC PROPERTIES
- DESCRIPTION "Free Lossless Audio Codec Library"
- PURPOSE "Enables FLAC support"
- )
- -set_package_properties (Lame PROPERTIES
- +set_package_properties (mp3lame PROPERTIES
- TYPE RECOMMENDED
- URL "https://lame.sourceforge.io/"
- DESCRIPTION "High quality MPEG Audio Layer III (MP3) encoder"
- @@ -237,20 +237,7 @@ if (INSTALL_PKGCONFIG_MODULE)
- endif ()
- if (ENABLE_MPEG)
- set (EXTERNAL_MPEG_REQUIRE "libmpg123")
- - get_filename_component(LAME_WE ${LAME_LIBRARY} NAME_WE)
- - if (LAME_HIP_LIBRARY)
- - get_filename_component(LAME_HIP_WE ${LAME_HIP_LIBRARY} NAME_WE)
- - endif ()
- - if (CMAKE_IMPORT_LIBRARY_PREFIX)
- - string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_WE_NO_PREFIX ${LAME_WE})
- - if (LAME_HIP_LIBRARY)
- - string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_HIP_WE_NO_PREFIX ${LAME_HIP_WE})
- - endif ()
- - endif ()
- - set (EXTERNAL_MPEG_LIBS "-l${LAME_WE_NO_PREFIX}")
- - if (LAME_HIP_LIBRARY)
- - set (EXTERNAL_MPEG_LIBS "${MPEG_LIBS} -l${LAME_HIP_WE}")
- - endif ()
- + set (EXTERNAL_MPEG_LIBS "-lmp3lame")
- endif ()
-
- configure_file (sndfile.pc.in sndfile.pc @ONLY)
- @@ -411,7 +398,7 @@ target_link_libraries (sndfile
- $<$<AND:$<BOOL:${ENABLE_EXPERIMENTAL}>,$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>,$<BOOL:${HAVE_SPEEX}>>:Speex::Speex>
- $<$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>:Opus::opus>
- $<$<BOOL:${HAVE_MPEG}>:MPG123::libmpg123>
- - $<$<BOOL:${HAVE_MPEG}>:Lame::Lame>
- + $<$<BOOL:${HAVE_MPEG}>:mp3lame::mp3lame>
- )
- set_target_properties (sndfile PROPERTIES
- PUBLIC_HEADER "${sndfile_HDRS}"
- diff --git a/cmake/SndFileChecks.cmake b/cmake/SndFileChecks.cmake
- index f5d5994..2e09ba6 100644
- --- a/cmake/SndFileChecks.cmake
- +++ b/cmake/SndFileChecks.cmake
- @@ -56,9 +56,9 @@ else ()
- set (HAVE_EXTERNAL_XIPH_LIBS 0)
- endif ()
-
- -find_package (Lame)
- +find_package (mp3lame)
- find_package (Mpg123 1.25.10)
- -if (LAME_FOUND AND (TARGET MPG123::libmpg123))
- +if (TARGET mp3lame::mp3lame AND (TARGET MPG123::libmpg123))
- set (HAVE_MPEG_LIBS 1)
- else ()
- set (HAVE_MPEG_LIBS 0)
- diff --git a/cmake/SndFileConfig.cmake.in b/cmake/SndFileConfig.cmake.in
- index 1d5463a..0c98e7e 100644
- --- a/cmake/SndFileConfig.cmake.in
- +++ b/cmake/SndFileConfig.cmake.in
- @@ -18,7 +18,7 @@ if (SndFile_WITH_EXTERNAL_LIBS AND NOT @BUILD_SHARED_LIBS@)
- endif ()
-
- if (SndFile_WITH_MPEG AND NOT @BUILD_SHARED_LIBS@)
- - find_dependency (Lame)
- + find_dependency (mp3lame)
- find_dependency (MPG123)
- endif ()
-
|