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, master has been updated
via 6646623993666ad4d18a82fd7571138a8c418046 (commit)
via 8fc0c98f082177acadaa208117a56327fcb83d9f (commit)
from bb99ab8e539e47c05593806b495fc9cdc230570c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6646623993666ad4d18a82fd7571138a8c418046
commit 6646623993666ad4d18a82fd7571138a8c418046
Merge: bb99ab8 8fc0c98
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 15 12:58:51 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Feb 15 07:58:57 2019 -0500
Merge topic 'tests-intel-fixup'
8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on
Windows
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2963
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fc0c98f082177acadaa208117a56327fcb83d9f
commit 8fc0c98f082177acadaa208117a56327fcb83d9f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 14 09:21:35 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Feb 14 09:27:40 2019 -0500
Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows
Fix a condition added by commit 091afa7342 (Tests: Teach tests when to
treat clang-cl as MSVC, 2018-11-06) to be specific to Clang.
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 616092d..b584e16 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -128,7 +128,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
endif()
# for msvc the compiler version determines which c++11 features are available.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR "x${CMAKE_CXX_SIMULATE_ID}"
STREQUAL "xMSVC")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"
+ OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_CXX_SIMULATE_ID}"
STREQUAL "xMSVC"))
if(";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_delegating_constructors;")
list(APPEND true_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
list(APPEND true_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
