summaryrefslogtreecommitdiff
path: root/Tests
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2020-10-25 12:26:42 -0400
committerBrad King <brad.king@kitware.com>2020-10-26 10:57:55 -0400
commitd192918586364b98e916887b190da825c1373f7f (patch)
tree5c753be8114cfd322a88a117c922b4cd20081907 /Tests
parent9fa7afe7d332ced27264f1ef7c921aa1d95bc476 (diff)
downloadcmake-d192918586364b98e916887b190da825c1373f7f.tar.gz
Modules: Do not implicitly add new functions via old Check Modules
The conversion of Check<Lang>CompilerFlag, SourceCompiles, and SourceRuns over to the new functions has the possibility of breaking projects that had functions with those existing names. To reduce the possibility of collisions we now have all the legacy code call functions that start with `cmake_`, and users will need to explicitly include the new modules to get the non-prefixed versions Fixes: #21359
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt4
-rw-r--r--Tests/RunCMake/CheckSourceRuns/UnknownArgument-stderr.txt4
2 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt b/Tests/RunCMake/CheckSourceCompiles/UnknownArgument-stderr.txt
index eed581af3f..a7e0af5152 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 8ae1ea1ffb..9b576b5a22 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\)$