diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-03-17 18:53:02 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-03-17 18:53:02 (GMT) |
| commit | 317d1705af4ae81e4a0b74db6f538ab0a873b041 (patch) | |
| tree | a67bd5a8400959366130c060a0e717bcddca9e64 /Modules | |
| parent | 7a888b68daa674690088f0beaf1a83fa8e409138 (diff) | |
| download | CMake-317d1705af4ae81e4a0b74db6f538ab0a873b041.zip CMake-317d1705af4ae81e4a0b74db6f538ab0a873b041.tar.gz CMake-317d1705af4ae81e4a0b74db6f538ab0a873b041.tar.bz2 | |
ENH: For Mac OS X, remove QuickTime link for Qt 4.3+ and add AppKit link for Qt 4.2+.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 663ff54..6721084 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1444,7 +1444,18 @@ IF (QT4_QMAKE_FOUND) ENDIF(Q_WS_WIN) IF(Q_WS_MAC) - SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime") + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon") + + # Qt 4.0, 4.1, 4.2 use QuickTime + IF(found_qt_minor_vers LESS 3) + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime") + ENDIF(found_qt_minor_vers LESS 3) + + # Qt 4.2+ use AppKit + IF(found_qt_minor_vers GREATER 1) + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit") + ENDIF(found_qt_minor_vers LESS 1) + SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices") ENDIF(Q_WS_MAC) |