From: Hendrik Leppkes Date: Tue, 16 Feb 2010 22:15:13 +0000 (+0100) Subject: Look for the phonon4 library in addition to plain phonon, as the Qt build on windows... X-Git-Tag: 0.6-beta1~2 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0a63415ba90b58da6c79cf27ff333a3d1bc52986;hp=442f91e70e3b4422948758e696b5e3c4b323bdc1 Look for the phonon4 library in addition to plain phonon, as the Qt build on windows names it like that. --- diff --git a/cmake/modules/FindPhonon.cmake b/cmake/modules/FindPhonon.cmake index daa457ad..28969c71 100644 --- a/cmake/modules/FindPhonon.cmake +++ b/cmake/modules/FindPhonon.cmake @@ -31,9 +31,9 @@ else(PHONON_FOUND) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir) - find_library(PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.) - find_library(PHONON_LIBRARY NAMES phonon) + find_library(PHONON_LIBRARY NAMES phonon phonon4) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)