[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1971-gd08309f
Stephen Kelly
steveire at gmail.com
Sun Apr 6 09:57:24 EDT 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 d08309f26697fe90bb1e4f67d29e2e343ee61f41 (commit)
via a1f0849e57402318238bbd135f62ad6279868aaa (commit)
via c9426fbd594627b6f5d9fb577b7ac3ee3b4f89e2 (commit)
via 6574b07b54f9a9c695ca270fe28095a02653aedd (commit)
from 5bc17bd38c69695a760685c330657043114222e7 (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=d08309f26697fe90bb1e4f67d29e2e343ee61f41
commit d08309f26697fe90bb1e4f67d29e2e343ee61f41
Merge: 5bc17bd a1f0849
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 09:57:23 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 6 09:57:23 2014 -0400
Merge topic 'MSVC-features' into next
a1f0849e Make sure tests for non-available features fail for the right reason.
c9426fbd Features: Record for MSVC 2010-2013.
6574b07b Silence some warnings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1f0849e57402318238bbd135f62ad6279868aaa
commit a1f0849e57402318238bbd135f62ad6279868aaa
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 15:56:25 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 6 15:56:25 2014 +0200
Make sure tests for non-available features fail for the right reason.
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 736cb66..6edb355 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -21,7 +21,7 @@ endforeach()
if (CMAKE_CXX_COMPILE_FEATURES)
include(CheckCXXSourceCompiles)
foreach(feature ${non_features})
- check_cxx_source_compiles("#include \"${CMAKE_CURRENT_SOURCE_DIR}/${feature}.cpp\"" ${feature}_works)
+ check_cxx_source_compiles("#include \"${CMAKE_CURRENT_SOURCE_DIR}/${feature}.cpp\"int main() { return 0; }\n" ${feature}_works)
if (${feature}_works)
message(SEND_ERROR
"Feature ${feature} expected not to work for ${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}. Update the supported features or blacklist it.")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9426fbd594627b6f5d9fb577b7ac3ee3b4f89e2
commit c9426fbd594627b6f5d9fb577b7ac3ee3b4f89e2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 15:55:37 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 6 15:56:05 2014 +0200
Features: Record for MSVC 2010-2013.
diff --git a/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
new file mode 100644
index 0000000..d839639
--- /dev/null
+++ b/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
@@ -0,0 +1,60 @@
+
+# Reference: http://msdn.microsoft.com/en-us/library/vstudio/hh567368.aspx
+
+set(_oldestSupported "_MSC_VER >= 1600")
+
+set(MSVC_2013 "_MSC_VER >= 1800")
+set(_cmake_feature_test_cxx_nonstatic_member_init "${MSVC_2013}")
+set(_cmake_feature_test_cxx_variadic_templates "${MSVC_2013}")
+set(_cmake_feature_test_cxx_generalized_initializers "${MSVC_2013}")
+set(_cmake_feature_test_cxx_default_function_template_args "${MSVC_2013}")
+set(_cmake_feature_test_cxx_alias_templates "${MSVC_2013}")
+set(_cmake_feature_test_cxx_delegating_constructors "${MSVC_2013}")
+set(_cmake_feature_test_cxx_explicit_conversions "${MSVC_2013}")
+set(_cmake_feature_test_cxx_raw_string_literals "${MSVC_2013}")
+set(_cmake_feature_test_cxx_defaulted_functions "${MSVC_2013}")
+set(_cmake_feature_test_cxx_deleted_functions "${MSVC_2013}")
+set(_cmake_feature_test_cxx_uniform_initialization "${MSVC_2013}")
+
+set(MSVC_2012 "_MSC_VER >= 1700")
+set(_cmake_feature_test_cxx_strong_enums "${MSVC_2012}")
+set(_cmake_feature_test_cxx_enum_forward_declarations "${MSVC_2012}")
+set(_cmake_feature_test_cxx_range_for "${MSVC_2012}")
+set(_cmake_feature_test_cxx_final "${MSVC_2012}")
+set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${MSVC_2012}")
+
+set(MSVC_2010 "_MSC_VER >= 1600")
+set(_cmake_feature_test_cxx_static_assert "${MSVC_2010}")
+set(_cmake_feature_test_cxx_auto_function "${MSVC_2010}")
+set(_cmake_feature_test_cxx_auto_type "${MSVC_2010}")
+set(_cmake_feature_test_cxx_decltype "${MSVC_2010}")
+set(_cmake_feature_test_cxx_lambdas "${MSVC_2010}")
+set(_cmake_feature_test_cxx_nullptr "${MSVC_2010}")
+set(_cmake_feature_test_cxx_rvalue_references "${MSVC_2010}")
+set(_cmake_feature_test_cxx_variadic_macros "${MSVC_2010}")
+set(_cmake_feature_test_cxx_right_angle_brackets "${MSVC_2010}")
+set(_cmake_feature_test_cxx_extended_friend_declarations "${MSVC_2010}")
+set(_cmake_feature_test_cxx_local_type_template_args "${MSVC_2010}")
+set(_cmake_feature_test_cxx_long_long_type "${MSVC_2010}")
+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}")
+
+# Currently unsupported:
+# set(_cmake_feature_test_cxx_reference_qualified_functions )
+# set(_cmake_feature_test_cxx_inheriting_constructors )
+# set(_cmake_feature_test_cxx_alignas )
+# set(_cmake_feature_test_cxx_alignof )
+# set(_cmake_feature_test_cxx_attributes )
+# set(_cmake_feature_test_cxx_thread_local )
+# set(_cmake_feature_test_cxx_noexcept )
+# set(_cmake_feature_test_cxx_user_literals )
+# set(_cmake_feature_test_cxx_constexpr )
+# set(_cmake_feature_test_cxx_unrestricted_unions )
+# set(_cmake_feature_test_cxx_unicode_literals )
+# set(_cmake_feature_test_cxx_inline_namespaces )
+# set(_cmake_feature_test_cxx_sizeof_member )
+# set(_cmake_feature_test_cxx_func_identifier )
+# set(_cmake_feature_test_gnu_cxx_typeof )
+
+set(_oldestSupported)
diff --git a/Modules/Platform/Windows-MSVC-CXX.cmake b/Modules/Platform/Windows-MSVC-CXX.cmake
index 0e85005..89885b8 100644
--- a/Modules/Platform/Windows-MSVC-CXX.cmake
+++ b/Modules/Platform/Windows-MSVC-CXX.cmake
@@ -4,3 +4,7 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
set(_FS_CXX " /FS")
endif()
__windows_compiler_msvc(CXX)
+
+macro(cmake_record_cxx_compile_features)
+ record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
+endmacro()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6574b07b54f9a9c695ca270fe28095a02653aedd
commit 6574b07b54f9a9c695ca270fe28095a02653aedd
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 15:53:34 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 6 15:53:34 2014 +0200
Silence some warnings.
diff --git a/Tests/CompileFeatures/cxx_local_type_template_args.cpp b/Tests/CompileFeatures/cxx_local_type_template_args.cpp
index 712e80c..802ea7a 100644
--- a/Tests/CompileFeatures/cxx_local_type_template_args.cpp
+++ b/Tests/CompileFeatures/cxx_local_type_template_args.cpp
@@ -15,4 +15,7 @@ void f() {
f(e1);
f(unnamed_obj);
f(b);
+ (void)x1;
+ (void)x2;
+ (void)x3;
}
diff --git a/Tests/CompileFeatures/cxx_right_angle_brackets.cpp b/Tests/CompileFeatures/cxx_right_angle_brackets.cpp
index 0adbbba..2713fd8 100644
--- a/Tests/CompileFeatures/cxx_right_angle_brackets.cpp
+++ b/Tests/CompileFeatures/cxx_right_angle_brackets.cpp
@@ -8,4 +8,5 @@ struct A
void someFunc()
{
A<A<int>> object;
+ (void)object;
}
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/MSVC-CXX-FeatureTests.cmake | 60 ++++++++++++++++++++
Modules/Platform/Windows-MSVC-CXX.cmake | 4 ++
Tests/CompileFeatures/CMakeLists.txt | 2 +-
.../cxx_local_type_template_args.cpp | 3 +
Tests/CompileFeatures/cxx_right_angle_brackets.cpp | 1 +
5 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 Modules/Compiler/MSVC-CXX-FeatureTests.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list