diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-14 21:17:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-14 21:17:15 (GMT) |
| commit | 4d278e490552ec60ea78e02d4fa02cbf905d9998 (patch) | |
| tree | 5e72af973cd7f33d79f5200a9fa259eb93417ecf | |
| parent | 4fd13c0f150f8201b8e8391d743fab86817c978b (diff) | |
| parent | 11cf52ebce8ee9bef4e79cfee3043016387f75b0 (diff) | |
| download | CMake-4d278e490552ec60ea78e02d4fa02cbf905d9998.zip CMake-4d278e490552ec60ea78e02d4fa02cbf905d9998.tar.gz CMake-4d278e490552ec60ea78e02d4fa02cbf905d9998.tar.bz2 | |
Merge topic 'alsa_prefix_include_fix'
11cf52e FindALSA: Fix version detection after last commit
815485e FindALSA: Fix incorrect include path detection
| -rw-r--r-- | Modules/FindALSA.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake index ec6e3a8..4a0b693 100644 --- a/Modules/FindALSA.cmake +++ b/Modules/FindALSA.cmake @@ -12,8 +12,8 @@ # #============================================================================= -# Copyright 2009 Kitware, Inc. -# Copyright 2009 Philip Lowman <philip@yhbt.com> +# Copyright 2009-2011 Kitware, Inc. +# Copyright 2009-2011 Philip Lowman <philip@yhbt.com> # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -25,8 +25,7 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -find_path(ALSA_INCLUDE_DIR NAMES asoundlib.h - PATH_SUFFIXES alsa +find_path(ALSA_INCLUDE_DIR NAMES alsa/asoundlib.h DOC "The ALSA (asound) include directory" ) @@ -34,8 +33,8 @@ find_library(ALSA_LIBRARY NAMES asound 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}") unset(alsa_version_str) |