diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-25 14:35:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-25 14:35:30 (GMT) |
| commit | 6f2e8bace1f7a94fd538b527131947d5725d4061 (patch) | |
| tree | 07ae9bf1846b43364f341e609e19edaa0e0b7c0e | |
| parent | f58d714f5e5a272497c8caf31a249db2300d05b1 (diff) | |
| parent | 90287792b6dc9bc1535c0677f9b3d81d0bd28905 (diff) | |
| download | CMake-6f2e8bace1f7a94fd538b527131947d5725d4061.zip CMake-6f2e8bace1f7a94fd538b527131947d5725d4061.tar.gz CMake-6f2e8bace1f7a94fd538b527131947d5725d4061.tar.bz2 | |
Merge branch 'try_compile-CMP0128' into release-3.24
Merge-request: !7821
| -rw-r--r-- | Tests/RunCMake/try_compile/RunCMakeTest.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake index fb4b836..3cfbfbf 100644 --- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake +++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake @@ -123,10 +123,11 @@ run_cmake(Inspect) include("${RunCMake_BINARY_DIR}/Inspect-build/info.cmake") # FIXME: Support more compilers and default standard levels. -if (CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|AppleClang)$" - AND DEFINED CMAKE_CXX_STANDARD_DEFAULT - AND DEFINED CMAKE_CXX_EXTENSIONS_DEFAULT - ) +if (DEFINED CMAKE_CXX_STANDARD_DEFAULT AND + DEFINED CMAKE_CXX_EXTENSIONS_DEFAULT AND ( + (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.7) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") + )) run_cmake(CMP0128-WARN) if(NOT CMAKE_CXX_STANDARD_DEFAULT EQUAL 11) run_cmake(CMP0128-NEW) |