summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-03-21 11:44:18 (GMT)
committerBrad King <brad.king@kitware.com>2018-03-21 11:51:20 (GMT)
commit3f479a3ca30543a0d61ebf28d4934c401ffdaa55 (patch)
tree96e12d92a085756f525ebeea28d305b1e9b35e74 /Tests
parent1c3bbda2f2920f416304086ece139ba1b50015ea (diff)
downloadCMake-3f479a3ca30543a0d61ebf28d4934c401ffdaa55.zip
CMake-3f479a3ca30543a0d61ebf28d4934c401ffdaa55.tar.gz
CMake-3f479a3ca30543a0d61ebf28d4934c401ffdaa55.tar.bz2
find_package: Improve CMP0074 warning messages
Policy `CMP0074` was added by commit eb35d8884b (find_package: Use PackageName_ROOT variables as search prefixes, 2018-03-15). Revise the logic to avoid warning when a `PackageName_ROOT` variable is set to empty since that won't change the search behavior. Also, when we do warn include the variable value(s) for reference.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/find_package/CMP0074-WARN-stderr.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/find_package/CMP0074-WARN-stderr.txt b/Tests/RunCMake/find_package/CMP0074-WARN-stderr.txt
index c762d92..27fbb86 100644
--- a/Tests/RunCMake/find_package/CMP0074-WARN-stderr.txt
+++ b/Tests/RunCMake/find_package/CMP0074-WARN-stderr.txt
@@ -7,9 +7,13 @@ CMake Warning \(dev\) at CMP0074-common.cmake:[0-9]+ \(find_package\):
Run "cmake --help-policy CMP0074" for policy details. Use the cmake_policy
command to set the policy and suppress this warning.
- CMake variable Foo_ROOT is set.
+ CMake variable Foo_ROOT is set to:
- Environment variable Foo_ROOT is set.
+ .*/Tests/RunCMake/find_package/PackageRoot/foo/cmake_root
+
+ Environment variable Foo_ROOT is set to:
+
+ .*/Tests/RunCMake/find_package/PackageRoot/foo/env_root
For compatibility, CMake is ignoring the variable.
Call Stack \(most recent call first\):