Parcourir la source

Merge topic 'qt4-version-regex'

4a772a1 Fix regex for qt minor version.
David Cole il y a 13 ans
Parent
commit
321bbed130
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      Modules/FindQt4.cmake

+ 1 - 1
Modules/FindQt4.cmake

@@ -1149,7 +1149,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
 
   # set version variables
   # 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_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}")
   string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
 
 
 endif()
 endif()