diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-12-14 21:24:18 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-12-14 21:24:18 +0000 |
| commit | 93bcab3adf37b3f12e69d1b2cfe3216c23e641d3 (patch) | |
| tree | 8038146db0939960d874cd5dede600b690ede968 | |
| parent | 3595b335f49353d05df9370acf1462b15ef21df6 (diff) | |
| download | extra-cmake-modules-93bcab3adf37b3f12e69d1b2cfe3216c23e641d3.tar.gz extra-cmake-modules-93bcab3adf37b3f12e69d1b2cfe3216c23e641d3.tar.bz2 | |
-add the framework path to QT_INCLUDE_DIR instead of QT_QTCORE_INCLUDE_DIR
Both are used always by UseQt4.cmake, and it is somewhat more logical to add it to QT_INCLUDE_DIR, since this is necessary when using Qt<Module>/foo.h includes, which is similar to the framework-style includes
Alex
CCMAIL: <mike@mikearthur.co.uk>
Mike, can you please confirm this also work for you on OSX ?
svn path=/trunk/KDE/kdelibs/; revision=1062473
| -rw-r--r-- | modules/FindQt4.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 8216a53e..c54b7a99 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -1021,7 +1021,8 @@ IF (QT4_QMAKE_FOUND) # is the framework directory in that case), since this will make the cmake include_directories() # command recognize that we need the framework flag with the respective directory (-F) IF(QT_USE_FRAMEWORKS) - SET(QT_QTCORE_INCLUDE_DIR ${QT_QTCORE_INCLUDE_DIR} ${QT_QTCORE_LIBRARY}) + SET(QT_INCLUDES ${QT_INCLUDES} ${QT_QTCORE_LIBRARY} ) + SET(QT_INCLUDE_DIR ${QT_INCLUDE_DIR} ${QT_QTCORE_LIBRARY} ) ENDIF(QT_USE_FRAMEWORKS) |