diff options
| author | David Faure <faure@kde.org> | 2009-08-18 22:09:20 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-08-18 22:09:20 +0000 |
| commit | 0ad628ce96572f7c2abfd561d580e52cd49a7b37 (patch) | |
| tree | 6332229432f11828d601dd93717ded44b2f5d4cf | |
| parent | f4ec59c58b550bf314c75cea38a18d2538404601 (diff) | |
| download | extra-cmake-modules-0ad628ce96572f7c2abfd561d580e52cd49a7b37.tar.gz extra-cmake-modules-0ad628ce96572f7c2abfd561d580e52cd49a7b37.tar.bz2 | |
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=/trunk/KDE/kdelibs/; revision=1013127
| -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 3ed05c06..7c79edeb 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 ) |