diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-01 20:30:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-03-01 20:30:17 (GMT) |
| commit | 79037a818e43e35c9e1b134d65f597d026ab6b54 (patch) | |
| tree | b9c8ddb90ffad4294b0161640bdbfc3aa0132b7d /Modules | |
| parent | b5b4aa2f713fd7e18a70b09d52aec1841c8393cf (diff) | |
| parent | 6b9bc54566544e0b1e4687d88d51424cb335114b (diff) | |
| download | CMake-79037a818e43e35c9e1b134d65f597d026ab6b54.zip CMake-79037a818e43e35c9e1b134d65f597d026ab6b54.tar.gz CMake-79037a818e43e35c9e1b134d65f597d026ab6b54.tar.bz2 | |
Merge topic 'qt4-setversion-regression-43cb9b8'
6b9bc54 Fix regression in 43cb9b8.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 2c3ba6e..b2a89f7 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() |