From: Colin Guthrie Date: Sun, 24 Jan 2010 12:05:20 +0000 (+0000) Subject: phonon: Add support to detect the pulsesupport.h header from kdesupport phonon package X-Git-Tag: 1.1.0-ff~923 X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=f56248d6f03b6bd6317854d0e92989bbac7ecce1 phonon: Add support to detect the pulsesupport.h header from kdesupport phonon package (cherry picked from commit 9885b4e6aba33c840056e11cc678b9990f03e629) Signed-off-by: Jean-Baptiste Kempf --- diff --git a/bindings/phonon/CMakeLists.txt b/bindings/phonon/CMakeLists.txt index a9f61a492c..f40f760898 100644 --- a/bindings/phonon/CMakeLists.txt +++ b/bindings/phonon/CMakeLists.txt @@ -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") diff --git a/bindings/phonon/cmake/modules/FindPhonon.cmake b/bindings/phonon/cmake/modules/FindPhonon.cmake index daa457ad0f..361b3fa4ff 100644 --- a/bindings/phonon/cmake/modules/FindPhonon.cmake +++ b/bindings/phonon/cmake/modules/FindPhonon.cmake @@ -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)