diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-14 14:21:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-14 14:27:40 (GMT) |
| commit | 8fc0c98f082177acadaa208117a56327fcb83d9f (patch) | |
| tree | eb3fd43966a3cad4ede36f45f2e1889ebff080bc /Tests/Module | |
| parent | 091afa7342e6c093f404b4777b81313535d73435 (diff) | |
| download | CMake-8fc0c98f082177acadaa208117a56327fcb83d9f.zip CMake-8fc0c98f082177acadaa208117a56327fcb83d9f.tar.gz CMake-8fc0c98f082177acadaa208117a56327fcb83d9f.tar.bz2 | |
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.
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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) |