[Cmake-commits] CMake branch, next, updated. v2.8.7-2063-gfab6cbf

Rolf Eike Beer eike at sf-mail.de
Tue Jan 10 17:43:25 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  fab6cbf37535b9e253972d075ab66684e26de555 (commit)
       via  a64706660c411c314bff8b08cbd3518f5b3e4fd6 (commit)
      from  93ff3554553270b680265f52903e0c7bb8785e2f (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=fab6cbf37535b9e253972d075ab66684e26de555
commit fab6cbf37535b9e253972d075ab66684e26de555
Merge: 93ff355 a647066
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 10 17:43:07 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 17:43:07 2012 -0500

    Merge topic 'test-symbol-exists' into next
    
    a647066 CheckCXXSymbolExists: use a much simpler fix for the missing std namespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a64706660c411c314bff8b08cbd3518f5b3e4fd6
commit a64706660c411c314bff8b08cbd3518f5b3e4fd6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 10 23:42:06 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 10 23:42:06 2012 +0100

    CheckCXXSymbolExists: use a much simpler fix for the missing std namespace
    
    Suggested by Brad King.

diff --git a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt
index d69e167..c55c05d 100644
--- a/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt
+++ b/Tests/Module/CheckCXXSymbolExists/CMakeLists.txt
@@ -65,14 +65,6 @@ IF (CMAKE_COMPILER_IS_GNUCXX)
   ENDIF (CSE_RESULT_O3)
 ENDIF (CMAKE_COMPILER_IS_GNUCXX)
 
-IF(CMAKE_CXX_COMPILER_ID IS "MIPSpro")
-  SET(NO_STD_NAMESPACE_FOR_ERRNO TRUE)
-ELSEIF(MSVC_VERSION AND NOT MSVC_VERSION VERSION_GREATER 1200)
-  SET(NO_STD_NAMESPACE_FOR_ERRNO TRUE)
-ELSE()
-  SET(NO_STD_NAMESPACE_FOR_ERRNO FALSE)
-ENDIF()
-
 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
index bd955a9..91642eb 100644
--- a/Tests/Module/CheckCXXSymbolExists/errno.cxx.in
+++ b/Tests/Module/CheckCXXSymbolExists/errno.cxx.in
@@ -11,12 +11,11 @@
 // others, too. To avoid breaking older compilers we don't simply use
 // std::errno.
 
-#cmakedefine NO_STD_NAMESPACE_FOR_ERRNO
+// but of course there are compilers where this doesn't work,
+// like MIPSpro and MSVC6
+namespace std { }
 
-#if !defined(NO_STD_NAMESPACE_FOR_ERRNO)
-// but of course there are compilers where this doesn't work
 using namespace std;
-#endif
 
 int main()
 {

-----------------------------------------------------------------------

Summary of changes:
 Tests/Module/CheckCXXSymbolExists/CMakeLists.txt |    8 --------
 Tests/Module/CheckCXXSymbolExists/errno.cxx.in   |    7 +++----
 2 files changed, 3 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list