This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via b60e7becd4273f15895b34c63b7ff8ff9dda27c6 (commit) via a7d1c4ec3f6e955262e3ae49e77430259e0bc12f (commit) from 7eea22de2d9b5055601dea903293b49ee6962e86 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b60e7becd4273f15895b34c63b7ff8ff9dda27c6 commit b60e7becd4273f15895b34c63b7ff8ff9dda27c6 Merge: 7eea22d a7d1c4e Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jun 2 14:35:18 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jun 2 14:35:18 2016 -0400 Merge topic 'compiler-id-with-bracket-in-path' into next a7d1c4ec CMakeDetermineCompilerId: Fix compiler id with square brackets in the path https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7d1c4ec3f6e955262e3ae49e77430259e0bc12f commit a7d1c4ec3f6e955262e3ae49e77430259e0bc12f Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jun 2 14:32:07 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jun 2 14:32:07 2016 -0400 CMakeDetermineCompilerId: Fix compiler id with square brackets in the path We use file(GLOB) to load the list of files produced by compiling the compiler identification source. Encode square brackets in the path to the directory so that they are not treated as special characters in the globbing expression. Otherwise we fail to find any files when the path contains square brackets and the compiler id is unknown. Reported-by: Esch Nigma <eschni...@openmailbox.org> 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 "") ----------------------------------------------------------------------- Summary of changes: Modules/CMakeDetermineCompilerId.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits