diff options
| author | Dirk Mueller <mueller@kde.org> | 2008-05-28 13:09:36 +0000 |
|---|---|---|
| committer | Dirk Mueller <mueller@kde.org> | 2008-05-28 13:09:36 +0000 |
| commit | c435a84a66fe48453abe0ed3ff6aa7bfa0d938ee (patch) | |
| tree | 307b0db3b1cf7f66c63555d8689e494eaabab6a7 | |
| parent | 0d4fbb6bfe527552c6515c3b8d2697ae3434f461 (diff) | |
| download | extra-cmake-modules-c435a84a66fe48453abe0ed3ff6aa7bfa0d938ee.tar.gz extra-cmake-modules-c435a84a66fe48453abe0ed3ff6aa7bfa0d938ee.tar.bz2 | |
add phonon includes back to KDE4_INCLUDES otherwise source
compatibility is broken, especially when phonon is installed
in a different prefix
svn path=/trunk/KDE/kdelibs/; revision=813676
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 9e65c77e..12112797 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1096,6 +1096,10 @@ if (KDE4Internal_FIND_REQUIRED AND NOT KDE4_FOUND) message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs") endif (KDE4Internal_FIND_REQUIRED AND NOT KDE4_FOUND) +find_package(Phonon REQUIRED) +set(KDE4_PHONON_LIBRARY ${PHONON_LIBRARY}) +set(KDE4_PHONON_LIBS ${PHONON_LIBS}) +set(KDE4_PHONON_INCLUDES ${PHONON_INCLUDES}) if (NOT KDE4Internal_FIND_QUIETLY) kde4_print_results() @@ -1103,7 +1107,13 @@ endif (NOT KDE4Internal_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path #the ${KDE4_INCLUDE_DIR}/KDE directory is for forwarding includes, eg. #include <KMainWindow> -set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${QT_INCLUDES} ${_KDE4_PLATFORM_INCLUDE_DIRS} ) +set(KDE4_INCLUDES + ${KDE4_INCLUDE_DIR} + ${KDE4_INCLUDE_DIR}/KDE + ${KDE4_PHONON_INCLUDES} + ${QT_INCLUDES} + ${_KDE4_PLATFORM_INCLUDE_DIRS} +) set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS ) @@ -1116,10 +1126,5 @@ if (NOT _kde4_uninstall_rule_created) endif (NOT _kde4_uninstall_rule_created) -find_package(Phonon REQUIRED) -set(KDE4_PHONON_LIBRARY ${PHONON_LIBRARY}) -set(KDE4_PHONON_LIBS ${PHONON_LIBS}) -set(KDE4_PHONON_INCLUDES ${PHONON_INCLUDES}) - endif(KDE4_FOUND) |