diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-30 13:51:25 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-30 09:51:35 -0400 |
| commit | 013c4133f79d0bd5e82254d0dfdfa42a6c8dfcc8 (patch) | |
| tree | bbfc9735ed293420f5ed6b93b243d762333c5f67 /Tests | |
| parent | 604fa62c01cea3dd6a90790f89ce12e4f0f28259 (diff) | |
| parent | a524bf3aa712a783e24e9307cf8915310fb8613a (diff) | |
| download | cmake-013c4133f79d0bd5e82254d0dfdfa42a6c8dfcc8.tar.gz | |
Merge topic 'CheckSourceRuns-compatibility' into release-3.19
a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5426
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt | 15 | ||||
| -rw-r--r-- | Tests/RunCMake/CheckSourceRuns/UnknownArgument.cmake | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt b/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt index 9b576b5a22..6824e7264b 100644 --- a/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt +++ b/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt @@ -1,4 +1,17 @@ -^CMake Error at [^ +^CMake Warning \(dev\) at [^ +]*/Modules/Internal/CheckSourceRuns.cmake:[0-9]+ \(message\): + Unknown argument: + + BAD + +Call Stack \(most recent call first\): + [^ +]*/Modules/CheckCSourceRuns.cmake:[0-9]+ \(cmake_check_source_runs\) + UnknownArgument.cmake:[0-9]+ \(check_c_source_runs\) + CMakeLists.txt:[0-9]+ \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. + +CMake Error at [^ ]*/Modules/Internal/CheckSourceRuns.cmake:[0-9]+ \(message\): Unknown argument: diff --git a/Tests/RunCMake/CheckSourceRuns/UnknownArgument.cmake b/Tests/RunCMake/CheckSourceRuns/UnknownArgument.cmake index 6e50fa7f9a..927a6b06a8 100644 --- a/Tests/RunCMake/CheckSourceRuns/UnknownArgument.cmake +++ b/Tests/RunCMake/CheckSourceRuns/UnknownArgument.cmake @@ -1,5 +1,7 @@ enable_language (C) +include(CheckCSourceRuns) include(CheckSourceRuns) -check_source_runs(C "int main() {return 0;}" SHOULD_BUILD SRC_EXT C BAD) +check_c_source_runs("int main() {return 0;}" C_SHOULD_BUILD BAD) +check_source_runs(C "int main() {return 0;}" SHOULD_BUILD SRC_EXT c BAD) |