[Cmake-commits] CMake branch, next, updated. v3.3.2-3400-g25e051b

[Brad King]

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  25e051b55896f9ba705ad58efa7f79abc64fa250 (commit)
       via  5fdf75947822bc17d30a9e60022a4fc77b4cdf63 (commit)
       via  c824b23d15b92247f3527f1b884c23d34e6749b5 (commit)
      from  eccf4cd362ea11c18871014045e7635c482a37bb (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=25e051b55896f9ba705ad58efa7f79abc64fa250
commit 25e051b55896f9ba705ad58efa7f79abc64fa250
Merge: eccf4cd 5fdf759
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 09:56:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 30 09:56:05 2015 -0400

    Merge topic 'compiler-features-solaris' into next
    
    5fdf7594 Tests: Suppress WriteCompilerDetectionHeader failure on SunPro
    c824b23d Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fdf75947822bc17d30a9e60022a4fc77b4cdf63
commit 5fdf75947822bc17d30a9e60022a4fc77b4cdf63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 09:53:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 30 09:53:52 2015 -0400

    Tests: Suppress WriteCompilerDetectionHeader failure on SunPro
    
    We do support SunPro 5.13 compiler features, but only on Linux.
    Suppress the portion of the test that fails on Solaris until
    the larger problem can be addressed.

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index c538280..ffee035 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -25,7 +25,8 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
   )
   add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
 
-  if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  if((UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
     include(CheckCXXSourceCompiles)
     check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n"
       file_include_works

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c824b23d15b92247f3527f1b884c23d34e6749b5
commit c824b23d15b92247f3527f1b884c23d34e6749b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 09:46:49 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 30 09:48:29 2015 -0400

    Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux

diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index dccc25e..0e936ca 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -33,6 +33,8 @@ set(CMAKE_CXX_CREATE_STATIC_LIBRARY
 
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+    set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++03")
+    set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=c++03")
     set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
     set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
   endif()

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

Summary of changes:
 Modules/Compiler/SunPro-CXX.cmake                        |    2 ++
 Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake