diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:40:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:40:28 (GMT) |
| commit | 321bbed130f3a61b089af2011c1f2467843f7050 (patch) | |
| tree | 3003c3eacf6771c28ce0efce0027027512da0943 | |
| parent | e11e719796e5d01783070b903771d8aecbfaf9d6 (diff) | |
| parent | 4a772a16865be1c1dc2937fc3963c7a67f5316f2 (diff) | |
| download | CMake-321bbed130f3a61b089af2011c1f2467843f7050.zip CMake-321bbed130f3a61b089af2011c1f2467843f7050.tar.gz CMake-321bbed130f3a61b089af2011c1f2467843f7050.tar.bz2 | |
Merge topic 'qt4-version-regex'
4a772a1 Fix regex for qt minor version.
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index e7d25c9..fac8579 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1149,7 +1149,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) # set version variables 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_MINOR "${QTVERSION}") string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}") endif() |