foxygit / doom Log in
commit 066f74fd2ee796018511eb95e51b2e4ca2b1d420
Author:     Roman Fomin <rfomin@gmail.com>
AuthorDate: Mon Jan 30 23:12:36 2023 +0700
Commit:     GitHub <noreply@github.com>
CommitDate: Mon Jan 30 17:12:36 2023 +0100

    cmake: Rename libsamplerate targets for compatibility with config mode (#1575)

    * cmake: Rename libsamplerate targets for compatibility with config mode

    * Fix `find_package_handle_standard_args` argument name

    * Fix name in Makefile.am

    * Restore find module name
---
 CMakeLists.txt             |  4 ++--
 cmake/Findsamplerate.cmake | 10 +++++-----
 src/CMakeLists.txt         |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a7bb6ec..e40d5f6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,8 @@ else()
 endif()

 # Check for libsamplerate.
-find_package(samplerate)
-if(SAMPLERATE_FOUND)
+find_package(SampleRate)
+if(SampleRate_FOUND)
     set(HAVE_LIBSAMPLERATE TRUE)
 endif()

diff --git a/cmake/Findsamplerate.cmake b/cmake/Findsamplerate.cmake
index f6a4804f..bd72802a 100644
--- a/cmake/Findsamplerate.cmake
+++ b/cmake/Findsamplerate.cmake
@@ -51,16 +51,16 @@ find_library(SAMPLERATE_LIBRARY "samplerate"
     HINTS ${PC_SAMPLERATE_LIBRARY_DIRS})

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(samplerate
-    FOUND_VAR SAMPLERATE_FOUND
+find_package_handle_standard_args(SampleRate
+    FOUND_VAR SampleRate_FOUND
     REQUIRED_VARS SAMPLERATE_INCLUDE_DIR SAMPLERATE_LIBRARY
     VERSION_VAR SAMPLERATE_VERSION
 )

-if(SAMPLERATE_FOUND)
+if(SampleRate_FOUND)
     # Imported target.
-    add_library(samplerate::samplerate UNKNOWN IMPORTED)
-    set_target_properties(samplerate::samplerate PROPERTIES
+    add_library(SampleRate::samplerate UNKNOWN IMPORTED)
+    set_target_properties(SampleRate::samplerate PROPERTIES
         INTERFACE_COMPILE_OPTIONS "${PC_SAMPLERATE_CFLAGS_OTHER}"
         INTERFACE_INCLUDE_DIRECTORIES "${SAMPLERATE_INCLUDE_DIR}"
         IMPORTED_LOCATION "${SAMPLERATE_LIBRARY}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f360945..3df4646a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -132,8 +132,8 @@ endif()
 if(ENABLE_SDL2_NET)
     list(APPEND EXTRA_LIBS SDL2_net::SDL2_net)
 endif()
-if(SAMPLERATE_FOUND)
-    list(APPEND EXTRA_LIBS samplerate::samplerate)
+if(SampleRate_FOUND)
+    list(APPEND EXTRA_LIBS SampleRate::samplerate)
 endif()
 if(PNG_FOUND)
     list(APPEND EXTRA_LIBS PNG::PNG)