[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.147 1.148

cmake-commits at cmake.org cmake-commits at cmake.org
Sat Feb 7 12:23:04 EST 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv24481

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  When detecting if qmake executable is changed, don't error if path
      contains regex chars.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.147
retrieving revision 1.148
diff -C 2 -d -r1.147 -r1.148
*** FindQt4.cmake	6 Feb 2009 04:01:37 -0000	1.147
--- FindQt4.cmake	7 Feb 2009 17:23:02 -0000	1.148
***************
*** 329,335 ****
  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}$")
  
    SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
--- 329,335 ----
  IF (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)



More information about the Cmake-commits mailing list