Browse Source

FindALSA: Fix version detection after last commit

Also, removed detection of header file from <PREFIX>/include.
Can't find any example in alsa source code where the library headers
were installed outside of <PREFIX>/include/alsa.
Philip Lowman 14 năm trước cách đây
mục cha
commit
11cf52ebce
1 tập tin đã thay đổi với 3 bổ sung5 xóa
  1. 3 5
      Modules/FindALSA.cmake

+ 3 - 5
Modules/FindALSA.cmake

@@ -25,9 +25,7 @@
 # (To distribute this file outside of CMake, substitute the full
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 #  License text for the above reference.)
 
 
-# Try to find asoundlib.h both in <PREFIX>/include/alsa and <PREFIX>/include
-# since older versions of ALSA put it in include directly
-find_path(ALSA_INCLUDE_DIR NAMES alsa/asoundlib.h asoundlib.h
+find_path(ALSA_INCLUDE_DIR NAMES alsa/asoundlib.h
           DOC "The ALSA (asound) include directory"
           DOC "The ALSA (asound) include directory"
 )
 )
 
 
@@ -35,8 +33,8 @@ find_library(ALSA_LIBRARY NAMES asound
           DOC "The ALSA (asound) library"
           DOC "The ALSA (asound) library"
 )
 )
 
 
-if(ALSA_INCLUDE_DIR AND EXISTS "${ALSA_INCLUDE_DIR}/version.h")
-  file(STRINGS "${ALSA_INCLUDE_DIR}/version.h" alsa_version_str REGEX "^#define[\t ]+SND_LIB_VERSION_STR[\t ]+\".*\"")
+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_STRING "${alsa_version_str}")
   unset(alsa_version_str)
   unset(alsa_version_str)