[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.181 1.182 UseQt4.cmake 1.24 1.25

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake UseQt4.cmake 
Log Message:
-better support for Qt4 as frameworks

before this patch -F<framework> dir had to be added manually in some way
when using Qt4 installed as framework and when using FindQt4.cmake directly,
i.e. without UseQt4.cmake. With this patch the framework dir is
automatically added to QT_INCLUDE_DIR when Qt is installed as a framework.

Ok by Clinton, tested already in KDE by Mike Arthur.

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.181
retrieving revision 1.182
diff -C 2 -d -r1.181 -r1.182
*** FindQt4.cmake	23 Nov 2009 22:53:50 -0000	1.181
--- FindQt4.cmake	16 Dec 2009 22:16:59 -0000	1.182
***************
*** 907,911 ****
      _QT4_ADJUST_LIB_VARS(QAXCONTAINER)
    ENDIF(WIN32)
!   
  
    #######################################
--- 907,920 ----
      _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)
! 
! 
  
    #######################################

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** UseQt4.cmake	15 Dec 2009 21:16:45 -0000	1.24
--- UseQt4.cmake	16 Dec 2009 22:16:59 -0000	1.25
***************
*** 24,30 ****
  
  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 "")
--- 24,27 ----