summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/find_package
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2020-01-01 19:46:16 (GMT)
committerRobert Maynard <robert.maynard@kitware.com>2020-01-01 20:00:42 (GMT)
commit6c92df382f7a94d02695a757efe6c80a5d2718df (patch)
treed5162384dd0371abc87a3f260f4048e7e74fe559 /Tests/RunCMake/find_package
parent23e782ce05b5996536eff4c075d4bc36a8d8ba85 (diff)
downloadCMake-6c92df382f7a94d02695a757efe6c80a5d2718df.zip
CMake-6c92df382f7a94d02695a757efe6c80a5d2718df.tar.gz
CMake-6c92df382f7a94d02695a757efe6c80a5d2718df.tar.bz2
find_package: Improve debug logging output
The find_package debug log messages are now easier to read when enabled by the `--debug-find` command-line option or `CMAKE_FIND_DEBUG_MODE` variable.
Diffstat (limited to 'Tests/RunCMake/find_package')
-rw-r--r--Tests/RunCMake/find_package/FromPATHEnv-stderr.txt10
-rw-r--r--Tests/RunCMake/find_package/MissingConfigDebug-stderr.txt5
2 files changed, 10 insertions, 5 deletions
diff --git a/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt b/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
index 5856d56..b35f05e 100644
--- a/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
+++ b/Tests/RunCMake/find_package/FromPATHEnv-stderr.txt
@@ -1,6 +1,7 @@
CMake Debug Log at FromPATHEnv.cmake:5 \(find_package\):
- find_package considered the following paths for Resolved.cmake
-.*
+ find_package considered the following paths for Resolved.cmake.*
+.*/Modules/FindResolved.cmake.*
+ The file was not found.*
<PackageName>_ROOT CMake variable.*
CMAKE_PREFIX_PATH variable.*
CMAKE_FRAMEWORK_PATH and CMAKE_APPBUNDLE_PATH variables.*
@@ -13,4 +14,7 @@ CMake Debug Log at FromPATHEnv.cmake:5 \(find_package\):
CMake variables defined in the Platform file.*
CMake System Package Registry.*
Paths specified by the find_package PATHS option.*
- Checking file.*\[.*Tests/RunCMake/find_package/PackageRoot/ResolvedConfig\.cmake\]
+ find_package considered the following locations for the Config module:.*
+.*Tests/RunCMake/find_package/PackageRoot/ResolvedConfig\.cmake.*
+ The file was found at.*
+.*Tests/RunCMake/find_package/PackageRoot/ResolvedConfig\.cmake
diff --git a/Tests/RunCMake/find_package/MissingConfigDebug-stderr.txt b/Tests/RunCMake/find_package/MissingConfigDebug-stderr.txt
index 8ff04a9..379bf7a 100644
--- a/Tests/RunCMake/find_package/MissingConfigDebug-stderr.txt
+++ b/Tests/RunCMake/find_package/MissingConfigDebug-stderr.txt
@@ -9,8 +9,9 @@
CMake System Package Registry.*
Paths specified by the find_package PATHS option.*
.*
- Checking file \[.*NotHereConfig.cmake\].*
- Checking file \[.*nothere-config.cmake\].*
+ .*NotHereConfig.cmake
+ .*nothere-config.cmake
+.*
CMake Warning at MissingConfigDebug.cmake:3 \(message\):
This warning must be reachable.
Call Stack \(most recent call first\):