From 93bcab3adf37b3f12e69d1b2cfe3216c23e641d3 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 14 Dec 2009 21:24:18 +0000 Subject: -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/foo.h includes, which is similar to the framework-style includes Alex CCMAIL: Mike, can you please confirm this also work for you on OSX ? svn path=/trunk/KDE/kdelibs/; revision=1062473 --- modules/FindQt4.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.1