diff --git a/Help/release/dev/find-modules.rst b/Help/release/dev/find-modules.rst index ff9ca6dadf..a92a6df5b8 100644 --- a/Help/release/dev/find-modules.rst +++ b/Help/release/dev/find-modules.rst @@ -1,5 +1,8 @@ Find Modules ------------ +* The :module:`FindALSA` module now provides a ``ALSA_VERSION`` result + variable. The ``ALSA_VERSION_STRING`` result variable is deprecated. + * The :module:`FindBZip2` module now provides a ``BZip2_VERSION`` result variable. The ``BZIP2_VERSION`` result variable is deprecated. diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake index 1198abedd0..d7e822bc14 100644 --- a/Modules/FindALSA.cmake +++ b/Modules/FindALSA.cmake @@ -5,7 +5,11 @@ FindALSA -------- -Finds the Advanced Linux Sound Architecture (ALSA) library (``asound``). +Finds the Advanced Linux Sound Architecture (ALSA) library (``asound``): + +.. code-block:: cmake + + find_package(ALSA [] [...]) Imported Targets ^^^^^^^^^^^^^^^^ @@ -24,7 +28,12 @@ Result Variables This module defines the following variables: ``ALSA_FOUND`` - Boolean indicating whether the ALSA library is found. + Boolean indicating whether (the requested version of) ALSA library is found. + +``ALSA_VERSION`` + .. versionadded:: 4.2 + + The version of ALSA found. ``ALSA_LIBRARIES`` List of libraries needed for linking to use ALSA library. @@ -43,6 +52,17 @@ The following cache variables may also be set: ``ALSA_LIBRARY`` The absolute path of the asound library. +Deprecated Variables +^^^^^^^^^^^^^^^^^^^^ + +The following variables are provided for backward compatibility: + +``ALSA_VERSION_STRING`` + .. deprecated:: 4.2 + Superseded by the ``ALSA_VERSION``. + + The version of ALSA found. + Examples ^^^^^^^^ @@ -68,14 +88,15 @@ find_library(ALSA_LIBRARY NAMES asound if(ALSA_INCLUDE_DIR AND EXISTS "${ALSA_INCLUDE_DIR}/alsa/version.h") file(STRINGS "${ALSA_INCLUDE_DIR}/alsa/version.h" alsa_version_str REGEX "^#define[\t ]+SND_LIB_VERSION_STR[\t ]+\".*\"") - string(REGEX REPLACE "^.*SND_LIB_VERSION_STR[\t ]+\"([^\"]*)\".*$" "\\1" ALSA_VERSION_STRING "${alsa_version_str}") + string(REGEX REPLACE "^.*SND_LIB_VERSION_STR[\t ]+\"([^\"]*)\".*$" "\\1" ALSA_VERSION "${alsa_version_str}") + set(ALSA_VERSION_STRING "${ALSA_VERSION}") unset(alsa_version_str) endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ALSA REQUIRED_VARS ALSA_LIBRARY ALSA_INCLUDE_DIR - VERSION_VAR ALSA_VERSION_STRING) + VERSION_VAR ALSA_VERSION) if(ALSA_FOUND) set( ALSA_LIBRARIES ${ALSA_LIBRARY} ) diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index 1b6e506550..9003fd63e8 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -111,6 +111,7 @@ endforeach() foreach( VTEST + ALSA BISON Boost BZip2 BZIP2 CUDA DOXYGEN diff --git a/Tests/FindALSA/Test/CMakeLists.txt b/Tests/FindALSA/Test/CMakeLists.txt index 2829740cf9..8ca7f99836 100644 --- a/Tests/FindALSA/Test/CMakeLists.txt +++ b/Tests/FindALSA/Test/CMakeLists.txt @@ -4,7 +4,7 @@ include(CTest) find_package(ALSA REQUIRED) -add_definitions(-DCMAKE_EXPECTED_ALSA_VERSION="${ALSA_VERSION_STRING}") +add_definitions(-DCMAKE_EXPECTED_ALSA_VERSION="${ALSA_VERSION}") add_executable(test_tgt main.c) target_link_libraries(test_tgt ALSA::ALSA)