Преглед изворни кода

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)
Philip Lowman пре 14 година
родитељ
комит
815485e933
1 измењених фајлова са 5 додато и 4 уклоњено
  1. 5 4
      Modules/FindALSA.cmake

+ 5 - 4
Modules/FindALSA.cmake

@@ -12,8 +12,8 @@
 #
 
 #=============================================================================
-# Copyright 2009 Kitware, Inc.
-# Copyright 2009 Philip Lowman <[email protected]>
+# Copyright 2009-2011 Kitware, Inc.
+# Copyright 2009-2011 Philip Lowman <[email protected]>
 #
 # 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"
 )