diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-09 20:27:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-09 20:27:23 (GMT) |
| commit | b5a46cab851fd0fce570d168f81ae0adfa32b33d (patch) | |
| tree | 741be0f8945eb17a4cc1586374b4e9dc736ab7ee /Modules | |
| parent | 5aa72c6374c905ec972c48ee3b25c06d2949f117 (diff) | |
| parent | cfba5ef111bf86e8820a4dff556b3a9edc1484cd (diff) | |
| download | CMake-b5a46cab851fd0fce570d168f81ae0adfa32b33d.zip CMake-b5a46cab851fd0fce570d168f81ae0adfa32b33d.tar.gz CMake-b5a46cab851fd0fce570d168f81ae0adfa32b33d.tar.bz2 | |
Merge topic 'qt4-imports-dir'
cfba5ef Fix regression in 2dae2f1 which added find of Qt imports dir.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 45bbd2e..6129329 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -482,7 +482,7 @@ IF (QT_QMAKE_EXECUTABLE) _qt4_query_qmake(QT_VERSION QTVERSION) # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path - IF("${QTVERSION}" MATCHES "Unknown") + IF(NOT QTVERSION) SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE) FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" @@ -493,7 +493,7 @@ IF (QT_QMAKE_EXECUTABLE) IF(QT_QMAKE_EXECUTABLE) _qt4_query_qmake(QT_VERSION QTVERSION) ENDIF(QT_QMAKE_EXECUTABLE) - ENDIF("${QTVERSION}" MATCHES "Unknown") + ENDIF(NOT QTVERSION) # check that we found the Qt4 qmake, Qt3 qmake output won't match here STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}") |