diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-02-14 06:11:20 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-02-14 06:11:20 (GMT) |
| commit | f868fe3abd829a2612e2d21c9811f8a79e1231c2 (patch) | |
| tree | 860f3ea461e5eb6e47c5de341184eea98d3c9756 /Modules/FindQt4.cmake | |
| parent | 3db5c76198e8a4d332c0c25779c7e7b9c628e235 (diff) | |
| download | CMake-f868fe3abd829a2612e2d21c9811f8a79e1231c2.zip CMake-f868fe3abd829a2612e2d21c9811f8a79e1231c2.tar.gz CMake-f868fe3abd829a2612e2d21c9811f8a79e1231c2.tar.bz2 | |
BUG: Fix error when paths have + in them. (special regex characters)
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 5795b63..c49e2c5 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) |