[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.161 1.162
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jul 16 18:53:22 EDT 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv28347
Modified Files:
FindQt4.cmake
Log Message:
BUG: fix relative paths from different drives on Windows
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.161
retrieving revision 1.162
diff -C 2 -d -r1.161 -r1.162
*** FindQt4.cmake 19 May 2009 15:38:18 -0000 1.161
--- FindQt4.cmake 16 Jul 2009 22:53:20 -0000 1.162
***************
*** 966,969 ****
--- 966,972 ----
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
ENDIF(_infileLength GREATER _binlength)
+ IF(WIN32 AND rel MATCHES "^[a-zA-Z]:") # absolute path
+ STRING(REGEX REPLACE "^([a-zA-Z]):(.*)$" "\\1_\\2" rel "${rel}")
+ ENDIF(WIN32 AND rel MATCHES "^[a-zA-Z]:")
SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
STRING(REPLACE ".." "__" _outfile ${_outfile})
More information about the Cmake-commits
mailing list