[Cmake-commits] CMake branch, next, updated. v2.8.7-2107-ge9e598e
Rolf Eike Beer
eike at sf-mail.de
Mon Jan 16 14:25:50 EST 2012
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 e9e598e8a5417c86bc9fb032e22e82a0241f8948 (commit)
via ff5a8d044b4a8efe6dde10bdffa33b7aa56e8133 (commit)
from 74d2757c6ffbd4012d566143c66cdcaf3e896f54 (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=e9e598e8a5417c86bc9fb032e22e82a0241f8948
commit e9e598e8a5417c86bc9fb032e22e82a0241f8948
Merge: 74d2757 ff5a8d0
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 16 14:25:39 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 14:25:39 2012 -0500
Merge topic 'test-symbol-exists' into next
ff5a8d0 Revert Check{,CXX}SymbolExists topic
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff5a8d044b4a8efe6dde10bdffa33b7aa56e8133
commit ff5a8d044b4a8efe6dde10bdffa33b7aa56e8133
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 16 20:21:41 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 16 20:22:55 2012 +0100
Revert Check{,CXX}SymbolExists topic
This became rather messy. Now that Brad introduced infrastructure for
CMakeOnly tests this can be done in a much simpler way.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4a174af..42b3ef7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -242,10 +242,6 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(Module.CheckCXXCompilerFlag CheckCXXCompilerFlag)
- ADD_TEST_MACRO(Module.CheckSymbolExists CheckSymbolExists)
-
- ADD_TEST_MACRO(Module.CheckCXXSymbolExists CheckCXXSymbolExists)
-
ADD_TEST(LinkFlags-prepare
${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
--build-and-test
diff --git a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt
deleted file mode 100644
index c55c05d..0000000
--- a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-# This test will verify if CheckCXXSymbolExists only report symbols available
-# for linking that really are. You can find some documentation on this in
-# bug 11333 where we found out that gcc would optimize out the actual
-# reference to the symbol, so symbols that are in fact _not_ available in the
-# given libraries (but seen in header) were reported as present.
-#
-# If you change this test do not forget to change the CheckSymbolExists
-# test, too.
-
-PROJECT(CheckCXXSymbolExists CXX)
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
-
-SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../CheckSymbolExists")
-
-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})
-
- IF (CSE_RESULT_${_config_type})
- MESSAGE(SEND_ERROR "CheckCXXSymbolExists reported a nonexistent symbol as existing in configuration ${_config_type}")
- ELSE (CSE_RESULT_${_config_type})
- MESSAGE(STATUS "Nonexistent symbol was not found")
- ENDIF (CSE_RESULT_${_config_type})
-endforeach()
-
-set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE})
-unset(CSE_RESULT_ERRNO_CERRNO CACHE)
-
-MESSAGE(STATUS "Checking <cerrno>")
-
-check_cxx_symbol_exists(errno "cerrno" CSE_RESULT_ERRNO_CERRNO)
-
-IF (NOT CSE_RESULT_ERRNO_CERRNO)
- unset(CSE_RESULT_ERRNO_ERRNOH CACHE)
-
- MESSAGE(STATUS "Checking <errno.h>")
-
- check_cxx_symbol_exists(errno "errno.h" CSE_RESULT_ERRNO_ERRNOH)
-
- IF (NOT CSE_RESULT_ERRNO_ERRNOH)
- MESSAGE(SEND_ERROR "CheckCXXSymbolExists did not find errno in <cerrno> and <errno.h>")
- ELSE (NOT CSE_RESULT_ERRNO_ERRNOH)
- MESSAGE(STATUS "errno found in <errno.h>")
- ENDIF (NOT CSE_RESULT_ERRNO_ERRNOH)
-ELSE (NOT CSE_RESULT_ERRNO_CERRNO)
- MESSAGE(STATUS "errno found in <cerrno>")
-ENDIF (NOT CSE_RESULT_ERRNO_CERRNO)
-
-IF (CMAKE_COMPILER_IS_GNUCXX)
- 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)
-
- IF (CSE_RESULT_O3)
- MESSAGE(SEND_ERROR "CheckCXXSymbolExists reported a nonexistent symbol as existing with optimization -O3")
- ELSE (CSE_RESULT_O3)
- MESSAGE(STATUS "Nonexistent symbol was not found")
- ENDIF (CSE_RESULT_O3)
-ENDIF (CMAKE_COMPILER_IS_GNUCXX)
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/errno.cxx.in" "${CMAKE_CURRENT_BINARY_DIR}/errno.cxx" @ONLY)
-
-add_executable(CheckCXXSymbolExists "${CMAKE_CURRENT_BINARY_DIR}/errno.cxx")
diff --git a/Tests/Module/CheckCXXSymbolExists/errno.cxx.in b/Tests/Module/CheckCXXSymbolExists/errno.cxx.in
deleted file mode 100644
index 91642eb..0000000
--- a/Tests/Module/CheckCXXSymbolExists/errno.cxx.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#cmakedefine CSE_RESULT_ERRNO_ERRNOH
-#cmakedefine CSE_RESULT_ERRNO_CERRNO
-
-#ifdef CSE_RESULT_ERRNO_CERRNO
-#include <cerrno>
-#else
-#include <errno.h>
-#endif
-
-// This is required for the Borland compiler, but should be right for all
-// others, too. To avoid breaking older compilers we don't simply use
-// std::errno.
-
-// but of course there are compilers where this doesn't work,
-// like MIPSpro and MSVC6
-namespace std { }
-
-using namespace std;
-
-int main()
-{
- return errno;
-}
diff --git a/Tests/Module/CheckSymbolExists/CMakeLists.txt b/Tests/Module/CheckSymbolExists/CMakeLists.txt
deleted file mode 100644
index 9956082..0000000
--- a/Tests/Module/CheckSymbolExists/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# This test will verify if CheckSymbolExists only report symbols available
-# for linking that really are. You can find some documentation on this in
-# bug 11333 where we found out that gcc would optimize out the actual
-# reference to the symbol, so symbols that are in fact _not_ available in the
-# given libraries (but seen in header) were reported as present.
-#
-# If you change this test do not forget to change the CheckCXXSymbolExists
-# test, too.
-
-PROJECT(CheckSymbolExists C)
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
-
-SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}")
-
-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})
- MESSAGE(SEND_ERROR "CheckSymbolExists reported a nonexistent symbol as existing in configuration ${_config_type}")
- ELSE (CSE_RESULT_${_config_type})
- MESSAGE(STATUS "Nonexistent symbol was not found")
- ENDIF (CSE_RESULT_${_config_type})
-endforeach()
-
-set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE})
-unset(CSE_RESULT_ERRNO CACHE)
-
-check_symbol_exists(errno "errno.h" CSE_RESULT_ERRNO)
-
-IF (NOT CSE_RESULT_ERRNO)
- 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)
-
-IF (CMAKE_COMPILER_IS_GNUC)
- 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)
-
- IF (CSE_RESULT_O3)
- MESSAGE(SEND_ERROR "CheckSymbolExists reported a nonexistent symbol as existing with optimization -O3")
- ELSE (CSE_RESULT_O3)
- MESSAGE(STATUS "Nonexistent symbol was not found")
- ENDIF (CSE_RESULT_O3)
-ENDIF (CMAKE_COMPILER_IS_GNUC)
-
-add_executable(CheckSymbolExists errno.c)
diff --git a/Tests/Module/CheckSymbolExists/cm_cse.h b/Tests/Module/CheckSymbolExists/cm_cse.h
deleted file mode 100644
index 4f41c76..0000000
--- a/Tests/Module/CheckSymbolExists/cm_cse.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CSE_DUMMY_H
-#define _CSE_DUMMY_H
-
-int non_existent_function_for_symbol_test();
-
-#endif
diff --git a/Tests/Module/CheckSymbolExists/errno.c b/Tests/Module/CheckSymbolExists/errno.c
deleted file mode 100644
index 6010f7c..0000000
--- a/Tests/Module/CheckSymbolExists/errno.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <errno.h>
-
-int main()
-{
- return errno;
-}
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 4 -
Tests/Module/CheckCXXSymbolExists/CMakeLists.txt | 70 ----------------------
Tests/Module/CheckCXXSymbolExists/errno.cxx.in | 23 -------
Tests/Module/CheckSymbolExists/CMakeLists.txt | 57 ------------------
Tests/Module/CheckSymbolExists/cm_cse.h | 6 --
Tests/Module/CheckSymbolExists/errno.c | 6 --
6 files changed, 0 insertions(+), 166 deletions(-)
delete mode 100644 Tests/Module/CheckCXXSymbolExists/CMakeLists.txt
delete mode 100644 Tests/Module/CheckCXXSymbolExists/errno.cxx.in
delete mode 100644 Tests/Module/CheckSymbolExists/CMakeLists.txt
delete mode 100644 Tests/Module/CheckSymbolExists/cm_cse.h
delete mode 100644 Tests/Module/CheckSymbolExists/errno.c
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list