diff options
| author | David Faure <faure@kde.org> | 2007-06-13 22:40:08 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2007-06-13 22:40:08 +0000 |
| commit | 8405ccdb9d092aa35405ad0dd98252884ea38219 (patch) | |
| tree | ab1601638ff7b0848c8108cb0ba78b25132bed41 | |
| parent | 4d4782aeaa3d342bcc73554826fd7f01cb7e8b7d (diff) | |
| download | extra-cmake-modules-8405ccdb9d092aa35405ad0dd98252884ea38219.tar.gz extra-cmake-modules-8405ccdb9d092aa35405ad0dd98252884ea38219.tar.bz2 | |
Fix for Q_WS_MAC on mac when frameworks are enabled, based on patch by mac.younker gmail.com
svn path=/trunk/KDE/kdelibs/; revision=675309
| -rw-r--r-- | modules/FindQt4.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 22458560..9ce256fc 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -187,6 +187,7 @@ INCLUDE(CheckSymbolExists) INCLUDE(MacroAddFileDependencies) +INCLUDE(MacroPushRequiredVars) SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) @@ -386,15 +387,19 @@ IF (QT4_QMAKE_FOUND) # Find out what window system we're using # ############################################# - # Save required includes variable - SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) + # Save required includes and required_flags variables + macro_push_required_vars() # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}") + # On Mac OS X when Qt has framework support, also add the framework path + IF( QT_USE_FRAMEWORKS ) + SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ") + ENDIF( QT_USE_FRAMEWORKS ) # Check for Window system symbols (note: only one should end up being set) CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11) - CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC) CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN) CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS) + CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC) IF (QT_QTCOPY_REQUIRED) CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY) @@ -403,8 +408,8 @@ IF (QT4_QMAKE_FOUND) ENDIF (NOT QT_IS_QTCOPY) ENDIF (QT_QTCOPY_REQUIRED) - # Restore CMAKE_REQUIRED_INCLUDES variable - SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) + # Restore CMAKE_REQUIRED_INCLUDES+CMAKE_REQUIRED_FLAGS variables + macro_pop_required_vars() # ############################################# |