diff options
| author | David Faure <faure@kde.org> | 2009-08-18 22:10:22 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-08-18 22:10:22 +0000 |
| commit | ee218eaff7ad13719fced8190cbb0fb0603e1dfd (patch) | |
| tree | 552a156621c9bc3dcaaf8cbd66da50a0de72c957 /modules | |
| parent | f260ed76a36559119dc8e0819bb7e4de063bd0ac (diff) | |
| download | extra-cmake-modules-ee218eaff7ad13719fced8190cbb0fb0603e1dfd.tar.gz extra-cmake-modules-ee218eaff7ad13719fced8190cbb0fb0603e1dfd.tar.bz2 | |
Backport: Fix detection of Qt's phonon, patch by Pavel Volkovitskiy, approved by Thiago.
This needs Qt-4.5.3 when it's out or kde-qt (which has the fix backported).
For older versions of Qt, it didn't work before, and it still won't work;
we used standalone phonon instead (and most people still do).
svn path=/branches/KDE/4.3/kdelibs/; revision=1013128
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindQt4.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 70676762..df2c006e 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -738,11 +738,13 @@ IF (QT4_QMAKE_FOUND) ${QT_HEADERS_DIR}/QtXmlPatterns NO_DEFAULT_PATH ) - + # Set QT_PHONON_INCLUDE_DIR - FIND_PATH(QT_PHONON_INCLUDE_DIR phonon + # Qt >= 4.5.3 (or kde-qt-4.5.2 which has the fix too) : Phonon/ClassName is inside include/phonon + # With previous versions of Qt, this could not work; upgrade Qt or use a standalone phonon + FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon PATHS - ${QT_INCLUDE_DIR}/phonon + ${QT_HEADERS_DIR}/phonon NO_DEFAULT_PATH ) |