]> git.sesse.net Git - vlc/commitdiff
phonon: Add support to detect the pulsesupport.h header from kdesupport phonon package
authorColin Guthrie <cguthrie@mandriva.org>
Sun, 24 Jan 2010 12:05:20 +0000 (12:05 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 25 Jan 2010 08:30:39 +0000 (09:30 +0100)
(cherry picked from commit 9885b4e6aba33c840056e11cc678b9990f03e629)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
bindings/phonon/CMakeLists.txt
bindings/phonon/cmake/modules/FindPhonon.cmake

index a9f61a492c73a4b1a6061f99a7ceccb024b660b8..f40f760898138c3f60ba0b2d282867672ed82977 100644 (file)
@@ -31,6 +31,9 @@ include (CheckCXXCompilerFlag)
 include (MacroEnsureVersion)
 
 find_package(Phonon REQUIRED)
+if(PHONON_PULSESUPPORT)
+  add_definitions(-DPHONON_PULSESUPPORT)
+endif(PHONON_PULSESUPPORT)
 find_package(VLC REQUIRED)
 if (NOT AUTOMOC4_VERSION)
    set(AUTOMOC4_VERSION "0.9.83")
index daa457ad0fe130ee949e66c8d0ae5ead9eff54da..361b3fa4ff42c2e042c00a4504ec38fae2993c16 100644 (file)
@@ -43,6 +43,7 @@ else(PHONON_FOUND)
       set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
       set(PHONON_FOUND TRUE)
       _phonon_find_version()
+      find_path(PHONON_PULSESUPPORT NAMES phonon/pulsesupport.h PATHS ${PHONON_INCLUDES})
    else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
       set(PHONON_FOUND FALSE)
    endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
@@ -51,6 +52,11 @@ else(PHONON_FOUND)
       if(NOT PHONON_FIND_QUIETLY)
          message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
          message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
+         if(PHONON_PULSESUPPORT)
+            message(STATUS "Found Phonon PulseAudio Support: Yes")
+         else(PHONON_PULSESUPPORT)
+            message(STATUS "Found Phonon PulseAudio Support: No")
+         endif(PHONON_PULSESUPPORT)
       endif(NOT PHONON_FIND_QUIETLY)
    else(PHONON_FOUND)
       if(Phonon_FIND_REQUIRED)