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 ff07a15758b434369771229ca2a664496d8d4522 (commit)
via 046828185e329b07757141b759e9a38393e64d2b (commit)
from f06bf49a9982f5adc55406b8c510c241489941e5 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff07a15758b434369771229ca2a664496d8d4522
commit ff07a15758b434369771229ca2a664496d8d4522
Merge: f06bf49 0468281
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 14 09:28:03 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 14 09:28:03 2015 -0500
Merge topic 'Apple-compiler-selection' into next
04682818 CMakeDetermineCompiler: Fix _query_xrun macro, rename to
_query_xcrun
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=046828185e329b07757141b759e9a38393e64d2b
commit 046828185e329b07757141b759e9a38393e64d2b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 14 09:27:15 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 14 09:27:33 2015 -0500
CMakeDetermineCompiler: Fix _query_xrun macro, rename to _query_xcrun
diff --git a/Modules/CMakeDetermineCompiler.cmake
b/Modules/CMakeDetermineCompiler.cmake
index e3b4434..85c8662 100644
--- a/Modules/CMakeDetermineCompiler.cmake
+++ b/Modules/CMakeDetermineCompiler.cmake
@@ -72,22 +72,22 @@ macro(_cmake_find_compiler lang)
# Look for a make tool provided by Xcode
if(CMAKE_HOST_APPLE)
- macro(_query_xrun compiler_name result_var_keyword result_var)
- if(NOT result_var_keyword STREQUAL "RESULT_VAR")
+ macro(_query_xcrun compiler_name result_var_keyword result_var)
+ if(NOT "x${result_var_keyword}" STREQUAL "xRESULT_VAR")
message(FATAL_ERROR "Bad arguments to macro")
endif()
execute_process(COMMAND xcrun --find ${compiler_name}
OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE _xcrun_err)
- set(${result_var} ${_xcrun_out})
+ set("${result_var}" "${_xcrun_out}")
endmacro()
set(xcrun_result)
if (CMAKE_${lang}_COMPILER MATCHES "^/usr/bin/(.+)$")
- _query_xrun(${CMAKE_MATCH_1} RESULT_VAR xcrun_result)
+ _query_xcrun("${CMAKE_MATCH_1}" RESULT_VAR xcrun_result)
elseif (CMAKE_${lang}_COMPILER STREQUAL "CMAKE_${lang}_COMPILER-NOTFOUND")
foreach(comp ${CMAKE_${lang}_COMPILER_LIST})
- _query_xrun(${comp} RESULT_VAR xcrun_result)
+ _query_xcrun("${comp}" RESULT_VAR xcrun_result)
if(xcrun_result)
break()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCompiler.cmake | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
