diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-03 14:45:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-03 14:45:46 (GMT) |
| commit | 4b7834467c21539bc478ccb3cd4b814057aa6cdd (patch) | |
| tree | 1663095d0a866da4edaa24162d0c50678764be1f | |
| parent | 6f1f7965af2d5a31f0cd47a84fe4399909cbc5a3 (diff) | |
| parent | a7d1c4ec3f6e955262e3ae49e77430259e0bc12f (diff) | |
| download | CMake-4b7834467c21539bc478ccb3cd4b814057aa6cdd.zip CMake-4b7834467c21539bc478ccb3cd4b814057aa6cdd.tar.gz CMake-4b7834467c21539bc478ccb3cd4b814057aa6cdd.tar.bz2 | |
Merge topic 'compiler-id-with-bracket-in-path'
a7d1c4ec CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 465989d..70ceaa6 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -365,14 +365,15 @@ ${CMAKE_${lang}_COMPILER_ID_OUTPUT} # Find the executable produced by the compiler, try all files in the # binary dir. + string(REGEX REPLACE "([][])" "[\\1]" _glob_id_dir "${CMAKE_${lang}_COMPILER_ID_DIR}") file(GLOB files RELATIVE ${CMAKE_${lang}_COMPILER_ID_DIR} # normal case - ${CMAKE_${lang}_COMPILER_ID_DIR}/* + ${_glob_id_dir}/* # com.apple.package-type.bundle.unit-test - ${CMAKE_${lang}_COMPILER_ID_DIR}/*.xctest/* + ${_glob_id_dir}/*.xctest/* ) list(REMOVE_ITEM files "${src}") set(COMPILER_${lang}_PRODUCED_FILES "") |