[Cmake-commits] CMake branch, next, updated. v3.1.0-1413-gcad7445
Robert Maynard
robert.maynard at kitware.com
Tue Dec 30 12:23:18 EST 2014
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 cad7445c492ece031d0521f4dc04ea05bf4770a7 (commit)
via 61348b0dcb21da79f2a397899f13b1869e842803 (commit)
via b27b068b6bf968e06e50184b8bae689d52b59f91 (commit)
via a07ece6a437b889d64818333b6ec99da5a1f078c (commit)
via d8f626b35ce1c51de3eca7fbd846e12e121788b4 (commit)
from 55efb6d191007eef921df832bae9ff014f85cd57 (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=cad7445c492ece031d0521f4dc04ea05bf4770a7
commit cad7445c492ece031d0521f4dc04ea05bf4770a7
Merge: 55efb6d 61348b0
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 12:23:17 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 30 12:23:17 2014 -0500
Merge topic 'feature_record_msvc' into next
61348b0d Features: Don't test cxx_contextual_conversions with MSVC.
b27b068b Features: MSVC trailing_return_types support was added in 2010.
a07ece6a Try and get compile features test to work with MSVC2010 - 2013
d8f626b3 Features: cxx_trailing_return_types was supported in MSVC 2013.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61348b0dcb21da79f2a397899f13b1869e842803
commit 61348b0dcb21da79f2a397899f13b1869e842803
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 12:21:33 2014 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Dec 30 12:21:33 2014 -0500
Features: Don't test cxx_contextual_conversions with MSVC.
VS2013 and above to conform to the updated cxx_contextual_conversions proposal,
but VS2010 and above pass the test. I am hesitant to say that VS2010 and above
meet all the requirements of the proposal currently.
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 0ff8ea4..52524f9 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -50,6 +50,13 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
cxx_return_type_deduction
)
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
+ cxx_contextual_conversions
+ )
set(C_ext c)
set(C_standard_flag 11)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b27b068b6bf968e06e50184b8bae689d52b59f91
commit b27b068b6bf968e06e50184b8bae689d52b59f91
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 12:21:07 2014 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Dec 30 12:21:07 2014 -0500
Features: MSVC trailing_return_types support was added in 2010.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 2a557b1..50e0cbe 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -37,7 +37,6 @@ set(_cmake_feature_test_cxx_explicit_conversions "${MSVC_2013}")
set(_cmake_feature_test_cxx_generalized_initializers "${MSVC_2013}")
set(_cmake_feature_test_cxx_nonstatic_member_init "${MSVC_2013}")
set(_cmake_feature_test_cxx_raw_string_literals "${MSVC_2013}")
-set(_cmake_feature_test_cxx_trailing_return_types "${MSVC_2013}")
set(_cmake_feature_test_cxx_uniform_initialization "${MSVC_2013}")
# Possibly broken:
# http://thread.gmane.org/gmane.comp.lib.boost.devel/244986/focus=245333
@@ -69,6 +68,7 @@ set(_cmake_feature_test_cxx_right_angle_brackets "${MSVC_2010}")
set(_cmake_feature_test_cxx_rvalue_references "${MSVC_2010}")
set(_cmake_feature_test_cxx_static_assert "${MSVC_2010}")
set(_cmake_feature_test_cxx_template_template_parameters "${MSVC_2010}")
+set(_cmake_feature_test_cxx_trailing_return_types "${MSVC_2010}")
set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}")
# Currently unsupported:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a07ece6a437b889d64818333b6ec99da5a1f078c
commit a07ece6a437b889d64818333b6ec99da5a1f078c
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 11:56:59 2014 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Dec 30 11:56:59 2014 -0500
Try and get compile features test to work with MSVC2010 - 2013
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index ff5d745..0ff8ea4 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -122,15 +122,15 @@ if (CMAKE_CXX_COMPILE_FEATURES)
add_executable(CompileFeaturesGenex genex_test.cpp)
set_property(TARGET CompileFeaturesGenex PROPERTY CXX_STANDARD 11)
- target_compile_definitions(CompileFeaturesGenex PRIVATE HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_final,cxx_override>)
+ target_compile_definitions(CompileFeaturesGenex PRIVATE HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_override>)
add_executable(CompileFeaturesGenex2 genex_test.cpp)
- target_compile_features(CompileFeaturesGenex2 PRIVATE cxx_constexpr)
- target_compile_definitions(CompileFeaturesGenex2 PRIVATE HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_final,cxx_override>)
+ target_compile_features(CompileFeaturesGenex2 PRIVATE cxx_static_assert)
+ target_compile_definitions(CompileFeaturesGenex2 PRIVATE HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_override>)
add_library(noexcept_iface INTERFACE)
target_compile_features(noexcept_iface INTERFACE cxx_noexcept)
add_executable(CompileFeaturesGenex3 genex_test.cpp)
target_link_libraries(CompileFeaturesGenex3 PRIVATE noexcept_iface)
- target_compile_definitions(CompileFeaturesGenex3 PRIVATE HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_final,cxx_override>)
+ target_compile_definitions(CompileFeaturesGenex3 PRIVATE HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_override>)
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8f626b35ce1c51de3eca7fbd846e12e121788b4
commit d8f626b35ce1c51de3eca7fbd846e12e121788b4
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 09:36:39 2014 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Dec 30 09:36:39 2014 -0500
Features: cxx_trailing_return_types was supported in MSVC 2013.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
index 980f53c..2a557b1 100644
--- a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -22,7 +22,6 @@ set(_cmake_feature_test_cxx_noexcept "${MSVC_2015}")
set(_cmake_feature_test_cxx_return_type_deduction "${MSVC_2015}")
set(_cmake_feature_test_cxx_sizeof_member "${MSVC_2015}")
set(_cmake_feature_test_cxx_thread_local "${MSVC_2015}")
-set(_cmake_feature_test_cxx_trailing_return_types "${MSVC_2015}")
set(_cmake_feature_test_cxx_unicode_literals "${MSVC_2015}")
set(_cmake_feature_test_cxx_unrestricted_unions "${MSVC_2015}")
set(_cmake_feature_test_cxx_user_literals "${MSVC_2015}")
@@ -38,6 +37,7 @@ set(_cmake_feature_test_cxx_explicit_conversions "${MSVC_2013}")
set(_cmake_feature_test_cxx_generalized_initializers "${MSVC_2013}")
set(_cmake_feature_test_cxx_nonstatic_member_init "${MSVC_2013}")
set(_cmake_feature_test_cxx_raw_string_literals "${MSVC_2013}")
+set(_cmake_feature_test_cxx_trailing_return_types "${MSVC_2013}")
set(_cmake_feature_test_cxx_uniform_initialization "${MSVC_2013}")
# Possibly broken:
# http://thread.gmane.org/gmane.comp.lib.boost.devel/244986/focus=245333
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/MSVC-CXX-FeatureTests.cmake | 2 +-
Tests/CompileFeatures/CMakeLists.txt | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list