From f26c235aba7388955849210556dc45c339fb43e1 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Sat, 7 Feb 2009 12:23:02 -0500 Subject: BUG: When detecting if qmake executable is changed, don't error if path contains regex chars. --- Modules/FindQt4.cmake | 6 +++--- 1 file 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) -- cgit v0.12