summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-07-07 12:06:03 (GMT)
committerBrad King <brad.king@kitware.com>2017-07-07 15:43:59 (GMT)
commite7730d78b44ca90aa8ee6d1f34495cd416888bce (patch)
tree08d34a6bf065300ce9ad6f9e9094d9b8cd352667 /Source
parent372de3f8039f69b3a2edcf7120083ec4097f8bd3 (diff)
downloadCMake-e7730d78b44ca90aa8ee6d1f34495cd416888bce.zip
CMake-e7730d78b44ca90aa8ee6d1f34495cd416888bce.tar.gz
CMake-e7730d78b44ca90aa8ee6d1f34495cd416888bce.tar.bz2
find_package: Restore longer message when config files were considered
Since commit v3.9.0-rc1~58^2 (find_package: shorten output for missing package in config mode, 2017-05-09) we print only the one line - Could NOT find Foo (missing: Foo_DIR) when package Foo cannot be found in CONFIG mode and it is not REQUIRED. However, in the case that package configuration files were found but not used, this one line message leaves out important information. This can happen when a package configuration file sets `Foo_FOUND` to `FALSE` or when its package version file does not match the requested version. Restore the longer message in these cases. Otherwise a seemingly valid explicit `Foo_DIR` setting appears to be silently ignored even if it was considered. Fixes: #17029
Diffstat (limited to 'Source')
-rw-r--r--Source/cmFindPackageCommand.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 65670e5..f291f9d 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -739,7 +739,8 @@ bool cmFindPackageCommand::HandlePackageMode()
if (result && !found) {
// warn if package required or neither quiet nor in config mode
if (this->Required ||
- !(this->Quiet || (this->UseConfigFiles && !this->UseFindModules))) {
+ !(this->Quiet || (this->UseConfigFiles && !this->UseFindModules &&
+ this->ConsideredConfigs.empty()))) {
// The variable is not set.
std::ostringstream e;
std::ostringstream aw;