diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-05-02 18:04:26 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-05-02 18:04:26 (GMT) |
| commit | 38373b5d4ca8bf6a5f30d313c96a1e5ef407b7aa (patch) | |
| tree | 557278edb86549c1af470b626ba6ebde237f2c4b /Modules/FindQt4.cmake | |
| parent | 4394cc80debead78dcb9a1176adf73cbe7064335 (diff) | |
| download | CMake-38373b5d4ca8bf6a5f30d313c96a1e5ef407b7aa.zip CMake-38373b5d4ca8bf6a5f30d313c96a1e5ef407b7aa.tar.gz CMake-38373b5d4ca8bf6a5f30d313c96a1e5ef407b7aa.tar.bz2 | |
ENH: fix qt version detection
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 8073118..ac7913c 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -212,9 +212,9 @@ 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" found_qt_major_vers "${qt_version_tmp}") + STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" found_qt_minor_vers "${qt_version_tmp}") + STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" found_qt_patch_vers "${qt_version_tmp}") # 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}") |