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, master has been updated
via 561b11d85cf962e15b5dd5e10e6d7f6654b96d67 (commit)
via 4637cc8f4af68d19744b4882414d80a16f707313 (commit)
from 0304408c6a6a01f3f3f62cd6fb08bfce8ee6b8e6 (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=561b11d85cf962e15b5dd5e10e6d7f6654b96d67
commit 561b11d85cf962e15b5dd5e10e6d7f6654b96d67
Merge: 0304408 4637cc8
Author: Craig Scott <[email protected]>
AuthorDate: Mon Jul 24 22:43:52 2017 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Mon Jul 24 18:43:57 2017 -0400
Merge topic 'CheckSymbolExists-rename-impl'
4637cc8f CheckSymbolExists: Rename implementation macro
Acked-by: Kitware Robot <[email protected]>
Merge-request: !1067
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4637cc8f4af68d19744b4882414d80a16f707313
commit 4637cc8f4af68d19744b4882414d80a16f707313
Author: Cristian Adam <[email protected]>
AuthorDate: Wed Jul 19 00:39:36 2017 +0200
Commit: Brad King <[email protected]>
CommitDate: Thu Jul 20 11:03:45 2017 -0400
CheckSymbolExists: Rename implementation macro
Currently the implementation macro for `check_symbol_exists` is
`_check_symbol_exists`, which impedes CMake users from overriding the
`check_symbol_exists` macro themselves.
diff --git a/Modules/CheckCXXSymbolExists.cmake
b/Modules/CheckCXXSymbolExists.cmake
index 354eea3..8552154 100644
--- a/Modules/CheckCXXSymbolExists.cmake
+++ b/Modules/CheckCXXSymbolExists.cmake
@@ -35,5 +35,5 @@
include(CheckSymbolExists)
macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
-
_CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
+
__CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
endmacro()
diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index 6f1afcf..6d52d56 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -45,15 +45,15 @@ the way the check is run:
macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
if(CMAKE_C_COMPILER_LOADED)
-
_CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.c"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
+
__CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.c"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
elseif(CMAKE_CXX_COMPILER_LOADED)
-
_CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
+
__CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
else()
message(FATAL_ERROR "CHECK_SYMBOL_EXISTS needs either C or CXX language
enabled")
endif()
endmacro()
-macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE)
+macro(__CHECK_SYMBOL_EXISTS_IMPL SOURCEFILE SYMBOL FILES VARIABLE)
if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")
set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckCXXSymbolExists.cmake | 2 +-
Modules/CheckSymbolExists.cmake | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
