[Cmake-commits] CMake branch, next, updated. v3.1.0-1850-g75b8f59
Brad King
brad.king at kitware.com
Tue Jan 13 16:01:31 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 75b8f5923866c9ce9f47a35574dcdd332f24b9dc (commit)
via 06bc75835a2fee9dadd6a2c0c0988f97c3316324 (commit)
from ca12a9763d13b8a2ba6dd0cbbff15a277654f120 (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=75b8f5923866c9ce9f47a35574dcdd332f24b9dc
commit 75b8f5923866c9ce9f47a35574dcdd332f24b9dc
Merge: ca12a97 06bc758
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 16:01:27 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 13 16:01:27 2015 -0500
Merge topic 'extend-COMPILE_FEATURES-test' into next
06bc7583 Revert "Features: Extend the tests for the COMPILE_FEATURES genex."
diff --cc Tests/CompileFeatures/CMakeLists.txt
index 58a5f2a,9fb8d1b..f0a4e74
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@@ -273,9 -168,5 +218,6 @@@ if (CMAKE_CXX_COMPILE_FEATURES
target_compile_definitions(CompileFeaturesGenex3 PRIVATE
HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_final,cxx_override>
HAVE_NULLPTR=$<COMPILE_FEATURES:cxx_nullptr>
- HAVE_THREAD_LOCAL=$<COMPILE_FEATURES:cxx_thread_local>
- HAVE_FINAL=$<COMPILE_FEATURES:cxx_final>
- HAVE_THREAD_LOCAL_AND_FINAL=$<COMPILE_FEATURES:cxx_thread_local,cxx_final>
)
+
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06bc75835a2fee9dadd6a2c0c0988f97c3316324
commit 06bc75835a2fee9dadd6a2c0c0988f97c3316324
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 16:00:51 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 13 16:00:51 2015 -0500
Revert "Features: Extend the tests for the COMPILE_FEATURES genex."
This reverts commit 4eb34e13fe4c24ac34330b1926fa045078389070.
The MSVC and AppleClang feature knowledge does not match this test yet.
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 80f16d6..9fb8d1b 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -146,64 +146,12 @@ if (CMAKE_CXX_COMPILE_FEATURES)
add_definitions(-DEXPECT_OVERRIDE_CONTROL=1)
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
- add_definitions(
- -DEXPECT_THREAD_LOCAL=1
- -DEXPECT_FINAL=1
- -DEXPECT_THREAD_LOCAL_AND_FINAL=1
- )
- elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
- add_definitions(
- -DEXPECT_THREAD_LOCAL=0
- -DEXPECT_FINAL=1
- -DEXPECT_THREAD_LOCAL_AND_FINAL=0
- )
- else()
- add_definitions(
- -DEXPECT_THREAD_LOCAL=0
- -DEXPECT_FINAL=0
- -DEXPECT_THREAD_LOCAL_AND_FINAL=0
- )
- endif()
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
- OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" )
- add_definitions(
- -DEXPECT_THREAD_LOCAL=1
- -DEXPECT_FINAL=1
- -DEXPECT_THREAD_LOCAL_AND_FINAL=1
- )
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1900)
- add_definitions(
- -DEXPECT_THREAD_LOCAL=1
- -DEXPECT_FINAL=1
- -DEXPECT_THREAD_LOCAL_AND_FINAL=1
- )
- elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 1700)
- add_definitions(
- -DEXPECT_THREAD_LOCAL=0
- -DEXPECT_FINAL=1
- -DEXPECT_THREAD_LOCAL_AND_FINAL=0
- )
- else()
- add_definitions(
- -DEXPECT_THREAD_LOCAL=0
- -DEXPECT_FINAL=0
- -DEXPECT_THREAD_LOCAL_AND_FINAL=0
- )
- endif()
- endif()
-
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>
HAVE_NULLPTR=$<COMPILE_FEATURES:cxx_nullptr>
- HAVE_THREAD_LOCAL=$<COMPILE_FEATURES:cxx_thread_local>
- HAVE_FINAL=$<COMPILE_FEATURES:cxx_final>
- HAVE_THREAD_LOCAL_AND_FINAL=$<COMPILE_FEATURES:cxx_thread_local,cxx_final>
)
add_executable(CompileFeaturesGenex2 genex_test.cpp)
@@ -211,9 +159,6 @@ if (CMAKE_CXX_COMPILE_FEATURES)
target_compile_definitions(CompileFeaturesGenex2 PRIVATE
HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_final,cxx_override>
HAVE_NULLPTR=$<COMPILE_FEATURES:cxx_nullptr>
- HAVE_THREAD_LOCAL=$<COMPILE_FEATURES:cxx_thread_local>
- HAVE_FINAL=$<COMPILE_FEATURES:cxx_final>
- HAVE_THREAD_LOCAL_AND_FINAL=$<COMPILE_FEATURES:cxx_thread_local,cxx_final>
)
add_library(static_assert_iface INTERFACE)
@@ -223,8 +168,5 @@ if (CMAKE_CXX_COMPILE_FEATURES)
target_compile_definitions(CompileFeaturesGenex3 PRIVATE
HAVE_OVERRIDE_CONTROL=$<COMPILE_FEATURES:cxx_final,cxx_override>
HAVE_NULLPTR=$<COMPILE_FEATURES:cxx_nullptr>
- HAVE_THREAD_LOCAL=$<COMPILE_FEATURES:cxx_thread_local>
- HAVE_FINAL=$<COMPILE_FEATURES:cxx_final>
- HAVE_THREAD_LOCAL_AND_FINAL=$<COMPILE_FEATURES:cxx_thread_local,cxx_final>
)
endif()
diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp
index c56d764..4412569 100644
--- a/Tests/CompileFeatures/genex_test.cpp
+++ b/Tests/CompileFeatures/genex_test.cpp
@@ -21,36 +21,6 @@ struct B : A
#error "Expect nullptr feature"
#else
-#if !HAVE_THREAD_LOCAL
-# if EXPECT_THREAD_LOCAL
-# error Expect cxx_thread_local support
-# endif
-#else
-# if !EXPECT_THREAD_LOCAL
-# error Expect no cxx_thread_local support
-# endif
-#endif
-
-#if !HAVE_FINAL
-# if EXPECT_FINAL
-# error Expect cxx_final support
-# endif
-#else
-# if !EXPECT_FINAL
-# error Expect no cxx_final support
-# endif
-#endif
-
-#if !HAVE_THREAD_LOCAL_AND_FINAL
-# if EXPECT_THREAD_LOCAL_AND_FINAL
-# error Expect cxx_thread_local and cxx_final support
-# endif
-#else
-# if !EXPECT_THREAD_LOCAL_AND_FINAL
-# error Expect no combined cxx_thread_local and cxx_final support
-# endif
-#endif
-
const char* getString()
{
return nullptr;
-----------------------------------------------------------------------
Summary of changes:
Tests/CompileFeatures/CMakeLists.txt | 58 ----------------------------------
Tests/CompileFeatures/genex_test.cpp | 30 ------------------
2 files changed, 88 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list