From f868fe3abd829a2612e2d21c9811f8a79e1231c2 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Thu, 14 Feb 2008 01:11:20 -0500 Subject: [PATCH] BUG: Fix error when paths have + in them. (special regex characters) --- Modules/FindQt4.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 5795b63a1..c49e2c585 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -903,12 +903,7 @@ IF (QT4_QMAKE_FOUND) # macro used to create the names of output files preserving relative dirs MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile ) - STRING(REGEX MATCH "${CMAKE_CURRENT_BINARY_DIR}" _match ${infile}) - IF(_match) - FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile}) - ELSE(_match) - FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile}) - ENDIF(_match) + FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile}) SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}") GET_FILENAME_COMPONENT(outpath ${_outfile} PATH) GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)