diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-15 12:58:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-15 12:58:57 (GMT) |
| commit | 6646623993666ad4d18a82fd7571138a8c418046 (patch) | |
| tree | 84c2c6465bb887d3701531dc5ad05b7cbbea0546 /Tests | |
| parent | bb99ab8e539e47c05593806b495fc9cdc230570c (diff) | |
| parent | 8fc0c98f082177acadaa208117a56327fcb83d9f (diff) | |
| download | CMake-6646623993666ad4d18a82fd7571138a8c418046.zip CMake-6646623993666ad4d18a82fd7571138a8c418046.tar.gz CMake-6646623993666ad4d18a82fd7571138a8c418046.tar.bz2 | |
Merge topic 'tests-intel-fixup'
8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2963
Diffstat (limited to 'Tests')
| -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) |