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 c07479619c47bcc30aa551bc46fd90311048126e (commit) via aea4c949c046a28ec49af4902d2f68c9e4b21a4f (commit) via 8728586c7f520d8c83d6f9dd6a6de80c8175ac9c (commit) via 3bda2a228a34d878f694e5caf45e370143115ca3 (commit) from 1e885d62cef2c1827992a6003adca512196ac5c1 (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=c07479619c47bcc30aa551bc46fd90311048126e commit c07479619c47bcc30aa551bc46fd90311048126e Merge: 1e885d6 aea4c94 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 6 13:21:35 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jan 6 13:21:35 2012 -0500 Merge topic 'test-symbol-exists' into next aea4c94 Check{,CXX}SymbolExists Test: do not hard remove the build directory 8728586 Check{,CXX}SymbolExists Test: improve errno searching 3bda2a2 Check{,CXX}SymbolExists Test: remove debugging option http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aea4c949c046a28ec49af4902d2f68c9e4b21a4f commit aea4c949c046a28ec49af4902d2f68c9e4b21a4f Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 6 19:17:39 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Jan 6 19:17:39 2012 +0100 Check{,CXX}SymbolExists Test: do not hard remove the build directory Unsetting the result variable in cache is enough for forcing a rerun of the checks. diff --git a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt index 0a47c56..8094639 100644 --- a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt +++ b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt @@ -11,7 +11,6 @@ cmake_minimum_required(VERSION 2.8) set(_test_dir "${CMAKE_CURRENT_BINARY_DIR}/symbol_cxx") set(_test_build_dir "${CMAKE_CURRENT_BINARY_DIR}/symbol_build") -file(REMOVE_RECURSE "${_test_build_dir}") file(MAKE_DIRECTORY "${_test_dir}" "${_test_build_dir}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in" "${_test_dir}/CMakeLists.txt" @ONLY) diff --git a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in index 4db0214..e73200b 100644 --- a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in +++ b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in @@ -8,6 +8,7 @@ INCLUDE(CheckCXXSymbolExists) foreach(_config_type Release RelWithDebInfo MinSizeRel Debug) set(CMAKE_TRY_COMPILE_CONFIGURATION ${_config_type}) + unset(CSE_RESULT_${_config_type} CACHE) MESSAGE(STATUS "Testing configuration ${_config_type}") check_cxx_symbol_exists(non_existent_function_for_symbol_test "cm_cse.h" CSE_RESULT_${_config_type}) @@ -19,6 +20,7 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug) endforeach() set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE}) +unset(CSE_RESULT_ERRNO CACHE) MESSAGE(STATUS "Checking <cerrno>") @@ -39,7 +41,8 @@ ELSE (NOT CSE_RESULT_ERRNO) ENDIF (NOT CSE_RESULT_ERRNO) IF (CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") + unset(CSE_RESULT_O3 CACHE) MESSAGE(STATUS "Testing with optimization -O3") check_cxx_symbol_exists(non_existent_function_for_symbol_test "cm_cse.h" CSE_RESULT_O3) diff --git a/Tests/Module/CheckSymbolExists/CMakeLists.txt b/Tests/Module/CheckSymbolExists/CMakeLists.txt index a52fd3b..8cfdbcb 100644 --- a/Tests/Module/CheckSymbolExists/CMakeLists.txt +++ b/Tests/Module/CheckSymbolExists/CMakeLists.txt @@ -11,7 +11,6 @@ cmake_minimum_required(VERSION 2.8) set(_test_dir "${CMAKE_CURRENT_BINARY_DIR}/symbol_c") set(_test_build_dir "${CMAKE_CURRENT_BINARY_DIR}/symbol_build") -file(REMOVE_RECURSE "${_test_build_dir}") file(MAKE_DIRECTORY "${_test_dir}" "${_test_build_dir}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in" "${_test_dir}/CMakeLists.txt" @ONLY) diff --git a/Tests/Module/CheckSymbolExists/CMakeLists.txt.in b/Tests/Module/CheckSymbolExists/CMakeLists.txt.in index fa40c47..3e0bad5 100644 --- a/Tests/Module/CheckSymbolExists/CMakeLists.txt.in +++ b/Tests/Module/CheckSymbolExists/CMakeLists.txt.in @@ -8,7 +8,9 @@ INCLUDE(CheckSymbolExists) foreach(_config_type Release RelWithDebInfo MinSizeRel Debug) set(CMAKE_TRY_COMPILE_CONFIGURATION ${_config_type}) + unset(CSE_RESULT_${_config_type} CACHE) MESSAGE(STATUS "Testing configuration ${_config_type}") + check_symbol_exists(non_existent_function_for_symbol_test "cm_cse.h" CSE_RESULT_${_config_type}) IF (CSE_RESULT_${_config_type}) @@ -19,6 +21,7 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug) endforeach() set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE}) +unset(CSE_RESULT_ERRNO CACHE) check_symbol_exists(errno "errno.h" CSE_RESULT_ERRNO) @@ -29,7 +32,8 @@ ELSE (NOT CSE_RESULT_ERRNO) ENDIF (NOT CSE_RESULT_ERRNO) IF (CMAKE_COMPILER_IS_GNUC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") + unset(CSE_RESULT_O3 CACHE) MESSAGE(STATUS "Testing with optimization -O3") check_symbol_exists(non_existent_function_for_symbol_test "cm_cse.h" CSE_RESULT_O3) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8728586c7f520d8c83d6f9dd6a6de80c8175ac9c commit 8728586c7f520d8c83d6f9dd6a6de80c8175ac9c Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 6 19:10:55 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Jan 6 19:13:07 2012 +0100 Check{,CXX}SymbolExists Test: improve errno searching -no need to immediately abort the test if searching for errno fails -check in <cerrno> first. Some dashboard builds have problems finding errno in <errno.h>, maybe this helps. diff --git a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in index be31acb..4db0214 100644 --- a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in +++ b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt.in @@ -20,12 +20,22 @@ endforeach() set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE}) -check_cxx_symbol_exists(errno "errno.h" CSE_RESULT_ERRNO) +MESSAGE(STATUS "Checking <cerrno>") + +check_cxx_symbol_exists(errno "cerrno" CSE_RESULT_ERRNO) IF (NOT CSE_RESULT_ERRNO) - MESSAGE(FATAL_ERROR "CheckCXXSymbolExists did not find errno in <errno.h>") + MESSAGE(STATUS "Checking <errno.h>") + + check_cxx_symbol_exists(errno "errno.h" CSE_RESULT_ERRNO) + + IF (NOT CSE_RESULT_ERRNO) + MESSAGE(SEND_ERROR "CheckCXXSymbolExists did not find errno in <cerrno> and <errno.h>") + ELSE (NOT CSE_RESULT_ERRNO) + MESSAGE(STATUS "errno found in <errno.h>") + ENDIF (NOT CSE_RESULT_ERRNO) ELSE (NOT CSE_RESULT_ERRNO) - MESSAGE(STATUS "errno found as expected") + MESSAGE(STATUS "errno found in <cerrno>") ENDIF (NOT CSE_RESULT_ERRNO) IF (CMAKE_COMPILER_IS_GNUCXX) diff --git a/Tests/Module/CheckSymbolExists/CMakeLists.txt.in b/Tests/Module/CheckSymbolExists/CMakeLists.txt.in index 00758c0..fa40c47 100644 --- a/Tests/Module/CheckSymbolExists/CMakeLists.txt.in +++ b/Tests/Module/CheckSymbolExists/CMakeLists.txt.in @@ -23,7 +23,7 @@ set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE}) check_symbol_exists(errno "errno.h" CSE_RESULT_ERRNO) IF (NOT CSE_RESULT_ERRNO) - MESSAGE(FATAL_ERROR "CheckSymbolExists did not find errno in <errno.h>") + MESSAGE(SEND_ERROR "CheckSymbolExists did not find errno in <errno.h>") ELSE (NOT CSE_RESULT_ERRNO) MESSAGE(STATUS "errno found as expected") ENDIF (NOT CSE_RESULT_ERRNO) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bda2a228a34d878f694e5caf45e370143115ca3 commit 3bda2a228a34d878f694e5caf45e370143115ca3 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Jan 6 19:03:56 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Jan 6 19:12:27 2012 +0100 Check{,CXX}SymbolExists Test: remove debugging option This likely breaks a lot of nightly builds. diff --git a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt index fbe9810..0a47c56 100644 --- a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt +++ b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt @@ -18,7 +18,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in" ADD_TEST(CheckCXXSymbolExists ${CMAKE_CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" - --debug-trycompile "${_test_dir}" ) set_tests_properties(CheckCXXSymbolExists PROPERTIES ----------------------------------------------------------------------- Summary of changes: Tests/Module/CheckCXXSymbolExists/CMakeLists.txt | 2 - .../Module/CheckCXXSymbolExists/CMakeLists.txt.in | 21 ++++++++++++++++--- Tests/Module/CheckSymbolExists/CMakeLists.txt | 1 - Tests/Module/CheckSymbolExists/CMakeLists.txt.in | 8 +++++- 4 files changed, 23 insertions(+), 9 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits