diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-27 11:02:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-27 11:02:49 (GMT) |
| commit | 479a9dfb6921b9357a827dc05ed0091af759f9fe (patch) | |
| tree | a48bd935d551dc503865ae11f50e2a17704b18fc /Tests | |
| parent | 374cca779baa2584bc071e4dca9a5d31d62cc331 (diff) | |
| parent | d192918586364b98e916887b190da825c1373f7f (diff) | |
| download | CMake-479a9dfb6921b9357a827dc05ed0091af759f9fe.zip CMake-479a9dfb6921b9357a827dc05ed0091af759f9fe.tar.gz CMake-479a9dfb6921b9357a827dc05ed0091af759f9fe.tar.bz2 | |
Merge topic 'check-module-name-conflicts' into release-3.19
d192918586 Modules: Do not implicitly add new functions via old Check Modules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5424
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt b/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt index eed581a..a7e0af5 100644 --- a/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt +++ b/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt @@ -1,9 +1,11 @@ ^CMake Error at [^ -]*/Modules/CheckSourceCompiles.cmake:[0-9]+ \(message\): +]*/Modules/Internal/CheckSourceCompiles.cmake:[0-9]+ \(message\): Unknown argument: BAD Call Stack \(most recent call first\): + [^ +]*/Modules/CheckSourceCompiles.cmake:[0-9]+ \(cmake_check_source_compiles\) UnknownArgument.cmake:[0-9]+ \(check_source_compiles\) CMakeLists.txt:[0-9]+ \(include\)$ diff --git a/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt b/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt index 8ae1ea1..9b576b5 100644 --- a/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt +++ b/Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt @@ -1,9 +1,11 @@ ^CMake Error at [^ -]*/Modules/CheckSourceRuns.cmake:[0-9]+ \(message\): +]*/Modules/Internal/CheckSourceRuns.cmake:[0-9]+ \(message\): Unknown argument: BAD Call Stack \(most recent call first\): + [^ +]*/Modules/CheckSourceRuns.cmake:[0-9]+ \(cmake_check_source_runs\) UnknownArgument.cmake:[0-9]+ \(check_source_runs\) CMakeLists.txt:[0-9]+ \(include\)$ |