From 6b9bc54566544e0b1e4687d88d51424cb335114b Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Wed, 23 Feb 2011 17:13:49 -0700 Subject: [PATCH] Fix regression in 43cb9b8. Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed. --- Modules/FindQt4.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 2c3ba6e1c..b2a89f7ad 100644 --- a/Modules/FindQt4.cmake +++ b/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()