[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.113 1.114

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
BUG:  Fix 6726.  Create correct moc rule for configured headers in binary dir.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.113
retrieving revision 1.114
diff -C 2 -d -r1.113 -r1.114
*** FindQt4.cmake	2 Apr 2008 15:05:51 -0000	1.113
--- FindQt4.cmake	7 Apr 2008 15:23:02 -0000	1.114
***************
*** 993,997 ****
    # macro used to create the names of output files preserving relative dirs
    MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
!     FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
      SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
      GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
--- 993,1003 ----
    # macro used to create the names of output files preserving relative dirs
    MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
!     STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
!     STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
!     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}")
      GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)