[cmake-commits] hoffman committed FindQt4.cmake 1.64 1.65

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Feb 2 16:51:53 EST 2007


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

Modified Files:
	FindQt4.cmake 
Log Message:
ENH: fix depend bug in qt


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- FindQt4.cmake	31 Jan 2007 20:06:07 -0000	1.64
+++ FindQt4.cmake	2 Feb 2007 21:51:51 -0000	1.65
@@ -866,13 +866,18 @@
       GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
       GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
       SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
-      #  parse file for dependencies
+      #  parse file for dependencies 
+      #  all files are absolute paths or relative to the location of the qrc file
       FILE(READ "${infile}" _RC_FILE_CONTENTS)
       STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
       SET(_RC_DEPENDS)
       FOREACH(_RC_FILE ${_RC_FILES})
         STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
-        SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}")
+        STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
+        IF(NOT _ABS_PATH_INDICATOR)
+          SET(_RC_FILE "${rc_path}/${_RC_FILE}")
+        ENDIF(NOT _ABS_PATH_INDICATOR)
+        SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
       ENDFOREACH(_RC_FILE)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_RCC_EXECUTABLE}



More information about the Cmake-commits mailing list