From bcf946ec26cd6a4f0db9901928554a44cdfafe70 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 25 May 2013 16:01:41 +0200 Subject: [PATCH] Find Phonon for Qt4 and Phonon4Qt5 for Qt5 --- CMakeLists.txt | 4 ++-- CMakeModules/FindPhonon.cmake | 31 +++++++++---------------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c8aa8a99..3a06a2e8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,8 +186,8 @@ if(BUILD_GUI AND UNIX AND NOT APPLE) endif() macro_optional_find_package(Phonon 4.5.0) -macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "") -if(PHONON_FOUND) +macro_log_feature(Phonon_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "") +if(Phonon_FOUND) message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4") endif() diff --git a/CMakeModules/FindPhonon.cmake b/CMakeModules/FindPhonon.cmake index cd9e5cb44..c0a0af0d2 100644 --- a/CMakeModules/FindPhonon.cmake +++ b/CMakeModules/FindPhonon.cmake @@ -11,27 +11,14 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -macro(_phonon_find_version) - set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h") - if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") - set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") - endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") - file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000) - string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}") - set(PHONON_VERSION "${CMAKE_MATCH_1}") -endmacro(_phonon_find_version) - -# the dirs listed with HINTS are searched before the default sets of dirs -find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR}) -find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR}) - -if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) - set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) - _phonon_find_version() -endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) - include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Phonon DEFAULT_MSG PHONON_INCLUDE_DIR PHONON_LIBRARY) -mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY) +if( NOT BUILD_WITH_QT4 ) + find_package(Phonon4Qt5 NO_MODULE) + set(Phonon_FOUND ${Phonon4Qt5_FOUND}) + set(Phonon_DIR ${Phonon4Qt5_DIR}) +else() + find_package(Phonon NO_MODULE) +endif() + +find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR )