diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-24 12:12:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-24 12:12:51 (GMT) |
| commit | 420073e53622bd344c9525bce4778ed6aed6276d (patch) | |
| tree | f819ae72f778b4a022d274a30b9287646a7fac1b /Tests/Module/WriteCompilerDetectionHeader | |
| parent | 07b93cb1850fa8365c42c4f9e671a423689b3d0a (diff) | |
| parent | 4f15a6a5c200be8235c3e38390aba438186e7f19 (diff) | |
| download | CMake-420073e53622bd344c9525bce4778ed6aed6276d.zip CMake-420073e53622bd344c9525bce4778ed6aed6276d.tar.gz CMake-420073e53622bd344c9525bce4778ed6aed6276d.tar.bz2 | |
Merge branch 'backport-clang-gnulike-support' into release-3.15
Merge-request: !3592
Diffstat (limited to 'Tests/Module/WriteCompilerDetectionHeader')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index b30928d..cffef5a 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -133,9 +133,7 @@ endif() # for msvc the compiler version determines which c++11 features are available. if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" - OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" - AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" - AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC" )) + 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) |