[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.140 1.141

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Fix #7969.  Fix moc output files if source dir contains regex characters.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.140
retrieving revision 1.141
diff -C 2 -d -r1.140 -r1.141
*** FindQt4.cmake	24 Oct 2008 21:48:35 -0000	1.140
--- FindQt4.cmake	5 Nov 2008 22:56:55 -0000	1.141
***************
*** 856,865 ****
      IF(_infileLength GREATER _binlength)
        STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
!     ENDIF(_infileLength GREATER _binlength)
!     IF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
!       FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
!     ELSE(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
        FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
!     ENDIF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
      SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
      STRING(REPLACE ".." "__" _outfile ${_outfile})
--- 856,867 ----
      IF(_infileLength GREATER _binlength)
        STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
!       IF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
!         FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
!       ELSE(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
!         FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
!       ENDIF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
!     ELSE(_infileLength GREATER _binlength)
        FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
!     ENDIF(_infileLength GREATER _binlength)
      SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
      STRING(REPLACE ".." "__" _outfile ${_outfile})