diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2009-02-07 17:23:02 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2009-02-07 17:23:02 (GMT) |
| commit | f26c235aba7388955849210556dc45c339fb43e1 (patch) | |
| tree | d8f8363ee498fb823c75e65f3dda6b2c2ffcf9f3 /Modules | |
| parent | 640fd4a528e0954b28f8740b6cfb03a925123850 (diff) | |
| download | CMake-f26c235aba7388955849210556dc45c339fb43e1.zip CMake-f26c235aba7388955849210556dc45c339fb43e1.tar.gz CMake-f26c235aba7388955849210556dc45c339fb43e1.tar.bz2 | |
BUG: When detecting if qmake executable is changed, don't error if path
contains regex chars.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 2701f80..ee4d8bb 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -328,9 +328,9 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS IF (QT_QMAKE_EXECUTABLE) - IF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$") - SET(QT_QMAKE_CHANGED 1) - ENDIF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$") + IF(QT_QMAKE_EXECUTABLE_LAST) + STRING(COMPARE NOTEQUAL "${QT_QMAKE_EXECUTABLE_LAST}" "${QT_QMAKE_EXECUTABLE}" QT_QMAKE_CHANGED) + ENDIF(QT_QMAKE_EXECUTABLE_LAST) SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE) |