[Cmake-commits] CMake branch, next, updated. v3.1.0-1473-g35eaf58
Robert Maynard
robert.maynard at kitware.com
Fri Jan 2 09:26:25 EST 2015
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 35eaf58f91224691aa0f68bfb61d866f695db936 (commit)
via 07fb7d435dd71aea389d9d89ffd4ef5aa14f1750 (commit)
via dd36560b72a7f3bb0325f29d9c4c7df2c8ed3f46 (commit)
from 383c5f1b1956818c4c2f5d4fd19c1a7283a8f7f3 (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=35eaf58f91224691aa0f68bfb61d866f695db936
commit 35eaf58f91224691aa0f68bfb61d866f695db936
Merge: 383c5f1 07fb7d4
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jan 2 09:26:24 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 2 09:26:24 2015 -0500
Merge topic 'feature_record_msvc' into next
07fb7d43 Fixup comments in commit: Enable writing of MSVC
dd36560b Fixup comments in commit: Record for MSVC 2015.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07fb7d435dd71aea389d9d89ffd4ef5aa14f1750
commit 07fb7d435dd71aea389d9d89ffd4ef5aa14f1750
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jan 2 09:23:57 2015 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri Jan 2 09:25:54 2015 -0500
Fixup comments in commit: Enable writing of MSVC
diff --git a/Modules/Compiler/MSVC-C-FeatureTests.cmake b/Modules/Compiler/MSVC-C-FeatureTests.cmake
index 64016bc..e449358 100644
--- a/Modules/Compiler/MSVC-C-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-C-FeatureTests.cmake
@@ -6,7 +6,6 @@
set(_cmake_oldestSupported "_MSC_VER >= 1300")
-#currently disabling everything while we test
set(MSVC_2010 "_MSC_VER >= 1600")
set(_cmake_feature_test_c_static_assert "${MSVC_2010}")
set(_cmake_feature_test_c_variadic_macros "${MSVC_2010}")
@@ -15,10 +14,10 @@ set(MSVC_2003 "_MSC_VER >= 1300")
set(_cmake_feature_test_c_function_prototypes "${MSVC_2003}")
# Currently unsupported:
-#restrict requires the __restrict syntax in msvc
-#set(_cmake_feature_test_c_restrict)
+# restrict requires the __restrict syntax in msvc
+# set(_cmake_feature_test_c_restrict)
-#Unset all the variables that we don't need exposed.
-#_cmake_oldestSupported is required by WriteCompilerDetectionHeader
+# Unset all the variables that we don't need exposed.
+# _cmake_oldestSupported is required by WriteCompilerDetectionHeader
set(MSVC_2010)
set(MSVC_2003)
\ No newline at end of file
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index d6f39bf..48abb5c 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -29,12 +29,11 @@ endforeach()
get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-#blacklist for msvc
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
list(REMOVE_ITEM cxx_features
- #This test requires auto return type deduction to work properly, but
- #that is not supported by all versions of MSVC that support decltype
- #incomplete return types.
+ # This test requires auto return type deduction to work properly, but
+ # that is not supported by all versions of MSVC that support decltype
+ # incomplete return types.
cxx_decltype_incomplete_return_types
)
endif()
@@ -64,9 +63,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
list(REMOVE_ITEM CXX_non_features
- #Micrsoft only officially supports this feature in VS2013 and above, due
- #to new wording of the proposal. We don't test for this with MSVC because
- #older compiler pass the test but might not actually conform
+ # Micrsoft only officially supports this feature in VS2013 and above, due
+ # to new wording of the proposal. We don't test for this with MSVC because
+ # older compiler pass the test but might not actually conform
cxx_contextual_conversions
)
endif()
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index cbfe3f3..cfaa78c 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -64,9 +64,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
endif()
-#for msvc the version determines if we support delegating constructors
-#and variadic templates. Luckily support for both of these features was
-#added in the same msvc version (1800)
+# for msvc the compiler version determines which c++11 features are available.
+# Both variadic templates and delegating constructors support exist in
+# all versions that we write compile headers for.
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND
";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_delegating_constructors;")
list(APPEND true_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index e4abed5..3b37091 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -27,9 +27,9 @@ if (NOT CXX_FEATURES)
run_cmake(NoSupportedCxxFeatures)
run_cmake(NoSupportedCxxFeaturesGenex)
else()
- #compilers such as MSVC have no explicit flags to enable C++11 mode,
- #it just is always on. So only run the link tests with compilers that require
- #a flag to specify the language version.
+ # compilers such as MSVC have no explicit flags to enable c++11 mode.
+ # Instead they come with all c++11 features implicitly enabled.
+ # So for those types of compilers this tests is not applicable.
if(CMAKE_CXX11_STANDARD_COMPILE_OPTION)
run_cmake(LinkImplementationFeatureCycle)
run_cmake(LinkImplementationFeatureCycleSolved)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd36560b72a7f3bb0325f29d9c4c7df2c8ed3f46
commit dd36560b72a7f3bb0325f29d9c4c7df2c8ed3f46
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jan 2 09:15:57 2015 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri Jan 2 09:25:38 2015 -0500
Fixup comments in commit: Record for MSVC 2015.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 2dba314..b238fde 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -46,7 +46,7 @@ set(_cmake_feature_test_cxx_uniform_initialization "${MSVC_2013}")
set(_cmake_feature_test_cxx_variadic_templates "${MSVC_2013}")
# Microsoft now states they support contextual conversions
# see footnote 6 at:
-# http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
+# http://blogs.msdn.com/b/vcblog/archive/2014/11/17/c-11-14-17-features-in-vs-2015-preview.aspx
set(_cmake_feature_test_cxx_contextual_conversions "${MSVC_2013}")
set(MSVC_2012 "_MSC_VER >= 1700")
@@ -89,8 +89,8 @@ set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}")
# set(_cmake_feature_test_cxx_variable_templates )
-#Unset all the variables that we don't need exposed.
-#_cmake_oldestSupported is required by WriteCompilerDetectionHeader
+# Unset all the variables that we don't need exposed.
+# _cmake_oldestSupported is required by WriteCompilerDetectionHeader
set(MSVC_2015)
set(MSVC_2013)
set(MSVC_2012)
diff --git a/Modules/Platform/Windows-MSVC-CXX.cmake b/Modules/Platform/Windows-MSVC-CXX.cmake
index d0599f9..ad56f68 100644
--- a/Modules/Platform/Windows-MSVC-CXX.cmake
+++ b/Modules/Platform/Windows-MSVC-CXX.cmake
@@ -5,9 +5,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
endif()
__windows_compiler_msvc(CXX)
-#No version of MSVC has full conformance to C++11. Therefore the
-#__cplusplus macro always evaluates to 98 even if the compilers come with
-#C++11/14/+ features enabled.
+# No version of MSVC has full conformance to C++11. Therefore the
+# __cplusplus macro always evaluates to 98 even if the compilers come with
+# C++11/14/+ features enabled.
set(CMAKE_CXX_STANDARD_DEFAULT 98)
macro(cmake_record_cxx_compile_features)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/MSVC-C-FeatureTests.cmake | 9 ++++-----
Modules/Compiler/MSVC-CXX-FeatureTests.cmake | 6 +++---
Modules/Platform/Windows-MSVC-CXX.cmake | 6 +++---
Tests/CompileFeatures/CMakeLists.txt | 13 ++++++-------
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 6 +++---
Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 6 +++---
6 files changed, 22 insertions(+), 24 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list