[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2002-g958b4e2

[Stephen Kelly]

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  958b4e2eba31677734c1c200c59d707fa97c6e62 (commit)
       via  a65232c1e82f4cb5f1b4a162478d17181453e992 (commit)
       via  cff207a9d3a7b243be44dc9b3c4e3883f4e3026a (commit)
      from  89f523544f368c21b695c3bc93c948ec093dace4 (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=958b4e2eba31677734c1c200c59d707fa97c6e62
commit 958b4e2eba31677734c1c200c59d707fa97c6e62
Merge: 89f5235 a65232c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 03:30:42 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 7 03:30:42 2014 -0400

    Merge topic 'MSVC-features' into next
    
    a65232c1 Features: Add msvc_cxx_sealed.
    cff207a9 Expand test configurations.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a65232c1e82f4cb5f1b4a162478d17181453e992
commit a65232c1e82f4cb5f1b4a162478d17181453e992
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 09:30:08 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 09:30:08 2014 +0200

    Features: Add msvc_cxx_sealed.

diff --git a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
index 223ce2d..332e945 100644
--- a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
+++ b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
@@ -239,3 +239,6 @@ The features known to this version of CMake are:
   The GNU typeof extension, as defined in the `GNU Typeof Documentation`_.
 
   .. _`GNU Typeof Documentation`: http://gcc.gnu.org/onlinedocs/gcc/Typeof.html#Typeof
+
+``msvc_cxx_sealed``
+  The MSVC sealed extension
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 22ee9c1..39915d0 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -40,6 +40,9 @@ set(_cmake_feature_test_cxx_override "${MSVC_2010}")
 set(_cmake_feature_test_cxx_extern_templates "${MSVC_2010}")
 set(_cmake_feature_test_cxx_template_template_parameters "${MSVC_2010}")
 
+# TODO: Supported since MSVC 1400
+set(_cmake_feature_test_msvc_cxx_sealed "${MSVC_2010}")
+
 # Currently unsupported:
 # http://herbsutter.com/2013/11/18/visual-c-compiler-november-2013-ctp/
 # set(_cmake_feature_test_cxx_reference_qualified_functions )
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e867f96..996799b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -87,7 +87,8 @@
   F(cxx_func_identifier) \
   F(cxx_long_long_type) \
   F(cxx_template_template_parameters) \
-  F(gnu_cxx_typeof)
+  F(gnu_cxx_typeof) \
+  F(msvc_cxx_sealed)
 
 class cmMakefile::Internals
 {
diff --git a/Tests/CompileFeatures/msvc_cxx_sealed.cpp b/Tests/CompileFeatures/msvc_cxx_sealed.cpp
new file mode 100644
index 0000000..1d4ea43
--- /dev/null
+++ b/Tests/CompileFeatures/msvc_cxx_sealed.cpp
@@ -0,0 +1,2 @@
+
+struct A sealed {};

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cff207a9d3a7b243be44dc9b3c4e3883f4e3026a
commit cff207a9d3a7b243be44dc9b3c4e3883f4e3026a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 09:26:04 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 09:26:04 2014 +0200

    Expand test configurations.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 00e6702..5e61bfe 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -126,7 +126,12 @@ add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
+    OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+    OR ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
+      AND NOT MSVC_VERSION VERSION_LESS 1600))
   add_RunCMake_test(target_compile_features)
 endif()
 add_RunCMake_test(CheckModules)

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

Summary of changes:
 Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst   |    3 +++
 Modules/Compiler/MSVC-CXX-FeatureTests.cmake |    3 +++
 Source/cmMakefile.cxx                        |    3 ++-
 Tests/CompileFeatures/msvc_cxx_sealed.cpp    |    2 ++
 Tests/RunCMake/CMakeLists.txt                |    7 ++++++-
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 Tests/CompileFeatures/msvc_cxx_sealed.cpp


hooks/post-receive
-- 
CMake