[Cmake-commits] CMake branch, next, updated. v3.1.1-2357-g2ae7b55
Brad King
brad.king at kitware.com
Mon Jan 26 14:40:45 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 2ae7b5534897c95a1722e82a0551d8b07ce591b8 (commit)
via 8580ac8409d19ba4a2b4b44a3c4933f93b4fb947 (commit)
via 0e8952d11f583f72f92b360847a96c012f0c662c (commit)
via 7343d054226778bea3899538b074bab8ab33c46a (commit)
via 8e5a71296ddb0959b3d55232823eea9495a8a797 (commit)
from 768ed74673d56ce22d79fdc2e58ecd2828694ab4 (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=2ae7b5534897c95a1722e82a0551d8b07ce591b8
commit 2ae7b5534897c95a1722e82a0551d8b07ce591b8
Merge: 768ed74 8580ac8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 14:40:44 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 14:40:44 2015 -0500
Merge topic 'feature-record-msvc' into next
8580ac84 Features: Move MSVC feature record logic to proper module
0e8952d1 fixup! Features: Extend CompileFeatures test for MSVC
7343d054 Features: Fix test to reject missing expectation definitions
8e5a7129 Features: Emit a test failure if 'override' is present but not expected
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8580ac8409d19ba4a2b4b44a3c4933f93b4fb947
commit 8580ac8409d19ba4a2b4b44a3c4933f93b4fb947
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 14:28:29 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 14:40:12 2015 -0500
Features: Move MSVC feature record logic to proper module
It goes in the Compiler module, not a platform-specific module.
diff --git a/Modules/Platform/Windows-MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake
similarity index 59%
copy from Modules/Platform/Windows-MSVC-CXX.cmake
copy to Modules/Compiler/MSVC-CXX.cmake
index ad56f68..88ca206 100644
--- a/Modules/Platform/Windows-MSVC-CXX.cmake
+++ b/Modules/Compiler/MSVC-CXX.cmake
@@ -1,13 +1,8 @@
-include(Platform/Windows-MSVC)
-set(_COMPILE_CXX " /TP")
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
- set(_FS_CXX " /FS")
-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.
+# C++11/14/+ features enabled. Later we should refactor the C++ side of
+# this within CMake to allow us to specify that there are no language level
+# flags for this compiler.
set(CMAKE_CXX_STANDARD_DEFAULT 98)
macro(cmake_record_cxx_compile_features)
diff --git a/Modules/Platform/Windows-MSVC-CXX.cmake b/Modules/Platform/Windows-MSVC-CXX.cmake
index ad56f68..0e85005 100644
--- a/Modules/Platform/Windows-MSVC-CXX.cmake
+++ b/Modules/Platform/Windows-MSVC-CXX.cmake
@@ -4,12 +4,3 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
set(_FS_CXX " /FS")
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.
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
-
-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=0e8952d11f583f72f92b360847a96c012f0c662c
commit 0e8952d11f583f72f92b360847a96c012f0c662c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 14:26:43 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 14:40:09 2015 -0500
fixup! Features: Extend CompileFeatures test for MSVC
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index a0dc2a5..5f93abc 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -210,18 +210,21 @@ if (CMAKE_CXX_COMPILE_FEATURES)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
add_definitions(
+ -DEXPECT_OVERRIDE_CONTROL=1
-DEXPECT_INHERITING_CONSTRUCTORS=1
-DEXPECT_FINAL=1
-DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=1
)
elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17.0)
add_definitions(
+ -DEXPECT_OVERRIDE_CONTROL=1
-DEXPECT_INHERITING_CONSTRUCTORS=0
-DEXPECT_FINAL=1
-DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=0
)
else()
add_definitions(
+ -DEXPECT_OVERRIDE_CONTROL=0
-DEXPECT_INHERITING_CONSTRUCTORS=0
-DEXPECT_FINAL=0
-DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=0
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7343d054226778bea3899538b074bab8ab33c46a
commit 7343d054226778bea3899538b074bab8ab33c46a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 14:25:22 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 14:39:58 2015 -0500
Features: Fix test to reject missing expectation definitions
Whenever feature support is added to a compiler, the CompileFeatures
test needs to be updated to set expected availability of features.
Add #error directives to ensure the test fails if expectations are
not set.
Suggested-by: Stephen Kelly <steveire at gmail.com>
diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp
index 7919eb4..2161bca 100644
--- a/Tests/CompileFeatures/genex_test.cpp
+++ b/Tests/CompileFeatures/genex_test.cpp
@@ -1,3 +1,15 @@
+#ifndef EXPECT_FINAL
+# error EXPECT_FINAL not defined
+#endif
+#ifndef EXPECT_INHERITING_CONSTRUCTORS
+# error EXPECT_INHERITING_CONSTRUCTORS not defined
+#endif
+#ifndef EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL
+# error EXPECT_INHERITING_CONSTRUCTORS_AND_FINAL not defined
+#endif
+#ifndef EXPECT_OVERRIDE_CONTROL
+# error EXPECT_OVERRIDE_CONTROL not defined
+#endif
#if !HAVE_OVERRIDE_CONTROL
#if EXPECT_OVERRIDE_CONTROL
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e5a71296ddb0959b3d55232823eea9495a8a797
commit 8e5a71296ddb0959b3d55232823eea9495a8a797
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 24 15:22:23 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 14:29:20 2015 -0500
Features: Emit a test failure if 'override' is present but not expected
diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp
index d9c8eec..7919eb4 100644
--- a/Tests/CompileFeatures/genex_test.cpp
+++ b/Tests/CompileFeatures/genex_test.cpp
@@ -4,6 +4,9 @@
#error "Expect override control feature"
#endif
#else
+#if !EXPECT_OVERRIDE_CONTROL
+#error "Expect no override control feature"
+#endif
struct A
{
-----------------------------------------------------------------------
Summary of changes:
.../Windows-MSVC-CXX.cmake => Compiler/MSVC-CXX.cmake} | 11 +++--------
Modules/Platform/Windows-MSVC-CXX.cmake | 9 ---------
Tests/CompileFeatures/CMakeLists.txt | 3 +++
Tests/CompileFeatures/genex_test.cpp | 15 +++++++++++++++
4 files changed, 21 insertions(+), 17 deletions(-)
copy Modules/{Platform/Windows-MSVC-CXX.cmake => Compiler/MSVC-CXX.cmake} (59%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list