kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'qt4-setversion-regression-43cb9b8' 

6b9bc54 Fix regression in 43cb9b8.
This commit is contained in:
Brad King 2011-03-01 15:30:17 -05:00 committed by CMake Topic Stage
parent b5b4aa2f71 6b9bc54566
commit 79037a818e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindQt4.cmake
View File

@ -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()