Browse Source

Fix regression in 43cb9b8.

Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed.
Clinton Stimpson 14 years ago
parent
commit
6b9bc54566
1 changed files with 5 additions and 0 deletions
  1. 5 0
      Modules/FindQt4.cmake

+ 5 - 0
Modules/FindQt4.cmake

@@ -1119,6 +1119,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
   INCLUDE("${_qt4_current_dir}/Qt4Macros.cmake")
 
+  # 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_PATCH "${QTVERSION}")
+
 ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)
 
 #support old QT_MIN_VERSION if set, but not if version is supplied by find_package()