diff options
| author | Andreas Pakulat <apaku@gmx.de> | 2009-05-28 22:19:31 +0000 |
|---|---|---|
| committer | Andreas Pakulat <apaku@gmx.de> | 2009-05-28 22:19:31 +0000 |
| commit | 56362390af4fb86fba0771eafdb174ed96224783 (patch) | |
| tree | 895e3711302ce37369532466cafe9d32b29e87ac | |
| parent | cfa2b7678a59d2fba8b569bb2cf2aa842cdef6d7 (diff) | |
| download | extra-cmake-modules-56362390af4fb86fba0771eafdb174ed96224783.tar.gz extra-cmake-modules-56362390af4fb86fba0771eafdb174ed96224783.tar.bz2 | |
Support and document QT_VERSION_(MAJOR|MINOR|PATCH) as does FindQt4.cmake from
cmake-upstream.
svn path=/trunk/KDE/kdelibs/; revision=974307
| -rw-r--r-- | modules/FindQt4.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index cfac9b60..4fc50324 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -120,6 +120,10 @@ # QT_FOUND If false, don't try to use Qt. # 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_QTCORE_FOUND True if QtCore was found. # QT_QTGUI_FOUND True if QtGui was found. # QT_QT3SUPPORT_FOUND True if Qt3Support was found. @@ -391,13 +395,13 @@ IF (QT_QMAKE_EXECUTABLE) ENDIF (NOT req_qt_major_vers EQUAL 4) # 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}") + 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 "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}") + MATH(EXPR found_vers "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100 + ${QT_VERSION_PATCH}") IF (found_vers LESS req_vers) SET(QT4_QMAKE_FOUND FALSE) |