diff options
| author | David Johnson <david@usermode.org> | 2008-01-29 17:20:02 +0000 |
|---|---|---|
| committer | David Johnson <david@usermode.org> | 2008-01-29 17:20:02 +0000 |
| commit | ce1f614b47054bd06df4d14521ee62f28d186552 (patch) | |
| tree | 142cd03d168b2aa6f6a2fbc0b2996bbb650d005a | |
| parent | 6fbe5347cd9211a6d3ed39bfa63f14b7e00dfd69 (diff) | |
| download | extra-cmake-modules-ce1f614b47054bd06df4d14521ee62f28d186552.tar.gz extra-cmake-modules-ce1f614b47054bd06df4d14521ee62f28d186552.tar.bz2 | |
adjust order of includes
svn path=/branches/KDE/4.0/kdelibs/; revision=768282
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/FindQt4.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index bab5fb96..fa62e7bd 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1030,7 +1030,7 @@ 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 ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} ) +set(KDE4_INCLUDES ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${_KDE4_PLATFORM_INCLUDE_DIRS} ${QT_INCLUDES} ) set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS ) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 0ad173a0..f8d0f562 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -604,7 +604,7 @@ IF (QT4_QMAKE_FOUND) MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR) # Set QT_INCLUDES - SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ) + SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR}) ######################################## @@ -833,7 +833,7 @@ IF (QT4_QMAKE_FOUND) IF (QT_${basename}_INCLUDE_DIR) #add the include directory to QT_INCLUDES - SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}") + SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES}) ENDIF (QT_${basename}_INCLUDE_DIR) # Make variables changeble to the advanced user |