diff options
| author | David Faure <faure@kde.org> | 2006-05-02 19:03:47 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-05-02 19:03:47 +0000 |
| commit | 61296af743e161a9a95de7286e0731cb966c3a22 (patch) | |
| tree | ac723e6f211557fcd9a7c9e8322a5a3203da0f96 | |
| parent | da5e0b9c9fbefdfcf051c32258200e523ea6075f (diff) | |
| download | extra-cmake-modules-61296af743e161a9a95de7286e0731cb966c3a22.tar.gz extra-cmake-modules-61296af743e161a9a95de7286e0731cb966c3a22.tar.bz2 | |
Fix Qt version parsing to accept "4.1.3-snapshot-20060502"
svn path=/trunk/KDE/kdelibs/; revision=536688
| -rw-r--r-- | modules/FindQt4.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 5edc2efa..cd9924a6 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -203,18 +203,18 @@ IF (QT_QMAKE_EXECUTABLE) ENDIF (NOT req_qt_major_vers) # now parse the parts of the user given version string into variables - STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}") - STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}") - STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}") + STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}") + STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}") + STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}") IF (NOT req_qt_major_vers EQUAL 4) MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", major version 4 is required, e.g. \"4.0.1\"") 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 "${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}") |