diff options
| -rw-r--r-- | Modules/FindQt4.cmake | 11 | ||||
| -rw-r--r-- | Modules/UseQt4.cmake | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 5a5a1b0..289698e 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -906,7 +906,16 @@ IF (QT4_QMAKE_FOUND) _QT4_ADJUST_LIB_VARS(QAXSERVER) _QT4_ADJUST_LIB_VARS(QAXCONTAINER) ENDIF(WIN32) - + + # If Qt is installed as a framework, we need to add QT_QTCORE_LIBRARY here (which + # 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_INCLUDES ${QT_INCLUDES} ${QT_QTCORE_LIBRARY} ) + SET(QT_INCLUDE_DIR ${QT_INCLUDE_DIR} ${QT_QTCORE_LIBRARY} ) + ENDIF(QT_USE_FRAMEWORKS) + + ####################################### # diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index 9192097..a18beaf 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -23,9 +23,6 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_ SET_PROPERTY(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG) INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR}) -IF(Q_WS_MAC AND QT_USE_FRAMEWORKS) - INCLUDE_DIRECTORIES(${QT_QTCORE_LIBRARY}) -ENDIF(Q_WS_MAC AND QT_USE_FRAMEWORKS) SET(QT_LIBRARIES "") |