[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.102 1.103

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv29830

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  For Mac OS X, remove QuickTime link for Qt 4.3+ and add AppKit link for Qt 4.2+.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.102
retrieving revision 1.103
diff -C 2 -d -r1.102 -r1.103
*** FindQt4.cmake	17 Mar 2008 15:10:42 -0000	1.102
--- FindQt4.cmake	17 Mar 2008 18:53:02 -0000	1.103
***************
*** 1445,1449 ****
    
    IF(Q_WS_MAC)
!     SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime")
      SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
    ENDIF(Q_WS_MAC)
--- 1445,1460 ----
    
    IF(Q_WS_MAC)
!     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)