[Cmake-commits] CMake branch, next, updated. v2.8.7-2570-ga2e8cbf

[Philip Lowman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a2e8cbf70204b2c9fec6414d224be2da9fd2cf5f (commit)
       via  11cf52ebce8ee9bef4e79cfee3043016387f75b0 (commit)
      from  e0a918e0996bfbde1bf511486c7810359b2731e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2e8cbf70204b2c9fec6414d224be2da9fd2cf5f
commit a2e8cbf70204b2c9fec6414d224be2da9fd2cf5f
Merge: e0a918e 11cf52e
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Feb 11 20:40:37 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 11 20:40:37 2012 -0500

    Merge topic 'alsa_prefix_include_fix' into next
    
    11cf52e FindALSA: Fix version detection after last commit


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11cf52ebce8ee9bef4e79cfee3043016387f75b0
commit 11cf52ebce8ee9bef4e79cfee3043016387f75b0
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Feb 11 20:37:48 2012 -0500
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Sat Feb 11 20:37:48 2012 -0500

    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.

diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake
index 41c4e30..4a0b693 100644
--- a/Modules/FindALSA.cmake
+++ b/Modules/FindALSA.cmake
@@ -25,9 +25,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  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"
 )
 
@@ -35,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)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindALSA.cmake |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake