diff options
author | Brad King <brad.king@kitware.com> | 2022-11-11 13:26:21 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-11 13:26:32 (GMT) |
commit | b0f02511e59bc02441f6211ea1ca8810d0ee77a5 (patch) | |
tree | 0dd3dbc7c16bc725c1981e3e71969727c9ce60e0 /Tests | |
parent | f2b438cb0afb577ee87c8bc2295ed3d263fc85f2 (diff) | |
parent | 46b2849550821353f1eb513527c1f47dc761cc68 (diff) | |
download | CMake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.zip CMake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.tar.gz CMake-b0f02511e59bc02441f6211ea1ca8810d0ee77a5.tar.bz2 |
Merge topic 'ci-clang15-windows'
46b2849550 ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows
3eb94e4d51 ci: Simplify LLVM/Clang CI job specs on Windows
8ba5835c8d ci: Factor out helper to load clang into environment on Windows
bf2e4a2e85 ci: Factor out helper to load ninja into environment on Windows
93ff726114 Tests: Fix TryCompile bad source case for clang-cl 15 on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7897
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/TryCompile/old_and_new_signature_tests.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/TryCompile/old_and_new_signature_tests.cmake b/Tests/TryCompile/old_and_new_signature_tests.cmake index ab548f7..1373ad7 100644 --- a/Tests/TryCompile/old_and_new_signature_tests.cmake +++ b/Tests/TryCompile/old_and_new_signature_tests.cmake @@ -117,7 +117,7 @@ try_compile(SHOULD_FAIL_DUE_TO_BAD_SOURCE if(SHOULD_FAIL_DUE_TO_BAD_SOURCE AND NOT CMAKE_GENERATOR MATCHES "Watcom WMake|NMake Makefiles") string(REPLACE "\n" "\n " output " ${output}") message(SEND_ERROR "try_compile with bad#source.c did not fail:\n${output}") -elseif(NOT output MATCHES [[(bad#source\.c|bad\.c|bad')]]) +elseif(NOT output MATCHES [[(bad#source\.c|bad\.c|bad[':])]]) string(REPLACE "\n" "\n " output " ${output}") message(SEND_ERROR "try_compile with bad#source.c failed without mentioning bad source:\n${output}") else() |