Merge topic 'compiler-id-with-bracket-in-path'

a7d1c4ec CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
This commit is contained in:
Brad King 2016-06-03 10:45:46 -04:00 committed by CMake Topic Stage
commit 4b7834467c
1 changed files with 3 additions and 2 deletions

View File

@ -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 "")