aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorGravatar Robert Förster2009-12-03 10:19:50 +0000
committerGravatar Robert Förster2009-12-03 10:19:50 +0000
commit9142e06fd9b585992d61661bb3f7e7f8f6cfbacf (patch)
treea78f3cfcf57ad62311936d7556b3c3d274c7c939 /cmake
parentsmall mingw fixes: phonon detection and avoid double moc inclusion (diff)
downloadKVIrc-9142e06fd9b585992d61661bb3f7e7f8f6cfbacf.tar.gz
KVIrc-9142e06fd9b585992d61661bb3f7e7f8f6cfbacf.tar.bz2
KVIrc-9142e06fd9b585992d61661bb3f7e7f8f6cfbacf.zip
merge from KDE r1057166: Find Phonon include directory on Qt with Frameworks.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3658 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/FindPhonon.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/FindPhonon.cmake b/cmake/modules/FindPhonon.cmake
index 806a8beb2..28969c718 100644
--- a/cmake/modules/FindPhonon.cmake
+++ b/cmake/modules/FindPhonon.cmake
@@ -35,7 +35,7 @@ else(PHONON_FOUND)
# then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
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} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+ 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)
if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)