[Bf-taskforce25] Patch to fix CMake + OpenAL

[Sebastian Skejø]

Hi,

Looking at CMake and OpenAL it seemed that CMake would try to build with OpenAL
as long as ALUT was found, even if you had WITH_OPENAL set to OFF.
This patch fixes this in 2.5:
http://www.pasteall.org/5815/diff
In svn this isn't a problem and I doubt it's relevant in 2.48a ;)
I've also attached the patch.

Regards,
Sebastian Skejø
skejoe
-------------- next part --------------
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 20503)
+++ CMakeLists.txt	(working copy)
@@ -98,22 +98,22 @@
     ELSE(OPENAL_FOUND)
       SET(WITH_OPENAL OFF)
     ENDIF(OPENAL_FOUND)
+
+    FIND_LIBRARY(ALUT_LIBRARY
+      NAMES alut
+      PATHS
+      /usr/local/lib
+      /usr/lib
+      /sw/lib
+      /opt/local/lib
+      /opt/csw/lib
+      /opt/lib
+    )
+    IF(ALUT_LIBRARY)
+      SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY})
+    ENDIF(ALUT_LIBRARY)
   ENDIF(WITH_OPENAL)
 
-  FIND_LIBRARY(ALUT_LIBRARY
-    NAMES alut
-    PATHS
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-  )
-  IF(ALUT_LIBRARY)
-    SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY})
-  ENDIF(ALUT_LIBRARY)
-
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS