[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/libkdegames
From:       Ian Wadham <iandw.au () gmail ! com>
Date:       2012-04-22 0:36:46
Message-ID: 20120422003646.D8C99AC89C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1290841 by ianw:

Show try_compile where to find and include sndfile.h, change a plural symbol to a \
singular and add messages about the results of the KgSound build.

 M  +7 -3      CMakeLists.txt  


--- trunk/KDE/kdegames/libkdegames/CMakeLists.txt #1290840:1290841
@@ -23,17 +23,21 @@
     message(STATUS "Checking libsndfile capabilities")
     try_compile(SNDFILE_WORKS
         ${CMAKE_CURRENT_BINARY_DIR}/audio/check-libsndfile-capabilities
-        ${CMAKE_CURRENT_SOURCE_DIR}/audio/check-libsndfile-capabilities.cpp)
+        ${CMAKE_CURRENT_SOURCE_DIR}/audio/check-libsndfile-capabilities.cpp
+        CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${SNDFILE_INCLUDE_DIR})
     if (NOT SNDFILE_WORKS)
-        message(FATAL_ERROR "Your version of libsndfile is too old. At least version \
0.21 is needed. To skip the optional OpenAL/libsndfile dependency in libkdegames (not \
recommended), re-run cmake with -DUSE_OPENAL_SNDFILE=OFF.") +        \
message(FATAL_ERROR "Your version of libsndfile (found in " ${SNDFILE_LIBRARIES} ") \
is too old. At least version 0.21 is needed. To skip the optional OpenAL/libsndfile \
dependency in libkdegames (not recommended), re-run cmake with \
-DUSE_OPENAL_SNDFILE=OFF.")  endif (NOT SNDFILE_WORKS)
 endif (SNDFILE_FOUND AND USE_OPENAL_SNDFILE)
 
 if (OPENAL_FOUND AND SNDFILE_FOUND AND SNDFILE_WORKS)
-    include_directories(${OPENAL_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIRS})
+    message (STATUS "INCLUDES FOR SOUND:  " ${OPENAL_INCLUDE_DIR} " " \
${SNDFILE_INCLUDE_DIR}) +    message (STATUS "LIBRARIES FOR SOUND: " \
${OPENAL_LIBRARY} " " ${SNDFILE_LIBRARIES}) +    \
include_directories(${OPENAL_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR})  \
set(KGAUDIO_LINKLIBS ${OPENAL_LIBRARY} ${SNDFILE_LIBRARIES})  set(KGAUDIO_BACKEND \
openal)  else (OPENAL_FOUND AND SNDFILE_FOUND AND SNDFILE_WORKS)
+    message (STATUS "FALLBACK LIBRARY FOR SOUND: " ${KDE4_PHONON_LIBS})
     set(KGAUDIO_LINKLIBS ${KDE4_PHONON_LIBS})
     set(KGAUDIO_BACKEND phonon)
 endif (OPENAL_FOUND AND SNDFILE_FOUND AND SNDFILE_WORKS)


[prev in list] [next in list] [prev in thread] [next in thread]