[Cmake-commits] CMake branch, master, updated. v3.8.1-1044-g30cb24f

[Kitware Robot]

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  30cb24f39cb5bd4dc053662d4cf1b124813e63d8 (commit)
       via  f15f905babad5977aa422e1753fe1aa658c77fa2 (commit)
      from  a83250880ad511d92d96bfd860873b9c79c0f462 (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=30cb24f39cb5bd4dc053662d4cf1b124813e63d8
commit 30cb24f39cb5bd4dc053662d4cf1b124813e63d8
Merge: a832508 f15f905
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 4 15:33:33 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu May 4 11:33:38 2017 -0400

    Merge topic 'sunpro-5.14'
    
    f15f905b Features: Record standards and features for SunPro 5.14
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !795


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f15f905babad5977aa422e1753fe1aa658c77fa2
commit f15f905babad5977aa422e1753fe1aa658c77fa2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 3 13:07:09 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 3 13:13:43 2017 -0400

    Features: Record standards and features for SunPro 5.14
    
    Oracle Studio 12.5 adds support for C 11 and associated standard flags.
    It also adds a few more C++ 11 features.

diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst
index 448fe9a..fa2aa8d 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -335,7 +335,7 @@ versions specified for each:
 * ``Clang``: Clang compiler versions 2.9 through 3.4.
 * ``GNU``: GNU compiler versions 4.4 through 5.0.
 * ``MSVC``: Microsoft Visual Studio versions 2010 through 2015.
-* ``SunPro``: Oracle SolarisStudio version 12.4.
+* ``SunPro``: Oracle SolarisStudio versions 12.4 through 12.5.
 * ``Intel``: Intel compiler versions 12.1 through 17.0.
 
 CMake is currently aware of the :prop_tgt:`C standards <C_STANDARD>`
diff --git a/Modules/Compiler/SunPro-C.cmake b/Modules/Compiler/SunPro-C.cmake
index 503684a..263bbe4 100644
--- a/Modules/Compiler/SunPro-C.cmake
+++ b/Modules/Compiler/SunPro-C.cmake
@@ -1,3 +1,8 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+include(Compiler/SunPro)
+
 set(CMAKE_C_VERBOSE_FLAG "-#")
 
 set(CMAKE_C_COMPILE_OPTIONS_PIC -KPIC)
@@ -22,5 +27,14 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Bdynamic")
 endforeach()
 
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.14)
+  set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
+  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=c90")
+  set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
+  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=c11")
+endif()
+
+__compiler_check_default_language_standard(C 5.13 90 5.14 11)
+
 set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
 set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/Compiler/SunPro-CXX-FeatureTests.cmake b/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
index 8e97e1d..60280ca 100644
--- a/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
@@ -5,6 +5,10 @@
 
 set(_cmake_oldestSupported "__SUNPRO_CC >= 0x5130")
 
+set(SolarisStudio125_CXX11 "(__SUNPRO_CC >= 0x5140) && __cplusplus >= 201103L")
+set(_cmake_feature_test_cxx_binary_literals "${SolarisStudio125_CXX11}")
+set(_cmake_feature_test_cxx_reference_qualified_functions "${SolarisStudio125_CXX11}")
+
 set(SolarisStudio124_CXX11 "(__SUNPRO_CC >= 0x5130) && __cplusplus >= 201103L")
 set(_cmake_feature_test_cxx_alignas "${SolarisStudio124_CXX11}")
 set(_cmake_feature_test_cxx_alignof "${SolarisStudio124_CXX11}")

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

Summary of changes:
 Help/manual/cmake-compile-features.7.rst       |    2 +-
 Modules/Compiler/SunPro-C.cmake                |   14 ++++++++++++++
 Modules/Compiler/SunPro-CXX-FeatureTests.cmake |    4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake