[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.122 1.123

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jun 6 01:36:43 EDT 2008


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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Fix for #7118.
      Relative paths going outside the current source dir resulted in badly
      placed moc source files in the build dir (or out of the build dir).



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.122
retrieving revision 1.123
diff -C 2 -d -r1.122 -r1.123
*** FindQt4.cmake	3 Jun 2008 14:29:11 -0000	1.122
--- FindQt4.cmake	6 Jun 2008 05:36:39 -0000	1.123
***************
*** 1022,1025 ****
--- 1022,1026 ----
      ENDIF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
      SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
+     STRING(REPLACE ".." "__" _outfile ${_outfile})
      GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
      GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)



More information about the Cmake-commits mailing list