[Cmake-commits] CMake branch, next, updated. v2.8.7-2568-ge0a918e

Philip Lowman philip at yhbt.com
Sat Feb 11 18:55:20 EST 2012


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  e0a918e0996bfbde1bf511486c7810359b2731e0 (commit)
       via  815485e9333e07fbbac66bfc415fa2ae5cbe8a85 (commit)
      from  5994d9dab7647a44d88bc6e7aadee60e379daf9f (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=e0a918e0996bfbde1bf511486c7810359b2731e0
commit e0a918e0996bfbde1bf511486c7810359b2731e0
Merge: 5994d9d 815485e
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Feb 11 18:55:00 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 11 18:55:00 2012 -0500

    Merge topic 'alsa_prefix_include_fix' into next
    
    815485e FindALSA: Fix incorrect include path detection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=815485e9333e07fbbac66bfc415fa2ae5cbe8a85
commit 815485e9333e07fbbac66bfc415fa2ae5cbe8a85
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Feb 11 18:51:22 2012 -0500
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Sat Feb 11 18:51:22 2012 -0500

    FindALSA: Fix incorrect include path detection
    
    This fixes a bug where the alsa include path was being detected
    incorrectly (e.g. /usr/local/include/alsa instead of /usr/local/include)

diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake
index ec6e3a8..41c4e30 100644
--- a/Modules/FindALSA.cmake
+++ b/Modules/FindALSA.cmake
@@ -12,8 +12,8 @@
 #
 
 #=============================================================================
-# Copyright 2009 Kitware, Inc.
-# Copyright 2009 Philip Lowman <philip at yhbt.com>
+# Copyright 2009-2011 Kitware, Inc.
+# Copyright 2009-2011 Philip Lowman <philip at yhbt.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -25,8 +25,9 @@
 # (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
+# 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
           DOC "The ALSA (asound) include directory"
 )
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list