[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.110 1.111

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Add QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH variables.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.110
retrieving revision 1.111
diff -C 2 -d -r1.110 -r1.111
*** FindQt4.cmake	24 Mar 2008 19:40:52 -0000	1.110
--- FindQt4.cmake	27 Mar 2008 19:18:35 -0000	1.111
***************
*** 111,114 ****
--- 111,118 ----
  #  QT4_FOUND        If false, don't try to use Qt 4.
  #
+ #  QT_VERSION_MAJOR The major version of Qt found.
+ #  QT_VERSION_MINOR The minor version of Qt found.
+ #  QT_VERSION_PATCH The patch version of Qt found.
+ #
  #  QT_EDITION               Set to the edition of Qt (i.e. DesktopLight)
  #  QT_EDITION_DESKTOPLIGHT  True if QT_EDITION == DesktopLight
***************
*** 327,337 ****
  
      # and now the version string given by qmake
!     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" found_qt_major_vers "${QTVERSION}")
!     STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" found_qt_minor_vers "${QTVERSION}")
!     STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" found_qt_patch_vers "${QTVERSION}")
  
      # compute an overall version number which can be compared at once
      MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
!     MATH(EXPR found_vers "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}")
  
      IF (found_vers LESS req_vers)
--- 331,341 ----
  
      # and now the version string given by qmake
!     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
!     STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
!     STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
  
      # compute an overall version number which can be compared at once
      MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
!     MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}")
  
      IF (found_vers LESS req_vers)
***************
*** 1505,1516 ****
      
      # 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 GREATER 1)
  
      SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
--- 1509,1520 ----
      
      # Qt 4.0, 4.1, 4.2 use QuickTime
!     IF(QT_VERSION_MINOR LESS 3)
        SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime")
!     ENDIF(QT_VERSION_MINOR LESS 3)
      
      # Qt 4.2+ use AppKit
!     IF(QT_VERSION_MINOR GREATER 1)
        SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
!     ENDIF(QT_VERSION_MINOR GREATER 1)
  
      SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")