diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-07 15:44:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-07 15:44:29 (GMT) |
| commit | 916b7d519557d4d11e73e66c3e9c95cdacb655ba (patch) | |
| tree | 9f143bb929975b34126655ab08412c566c717259 /Source | |
| parent | 658ecc1a7cab54aeb738a00e7fee24aa4bd18adb (diff) | |
| parent | e7730d78b44ca90aa8ee6d1f34495cd416888bce (diff) | |
| download | CMake-916b7d519557d4d11e73e66c3e9c95cdacb655ba.zip CMake-916b7d519557d4d11e73e66c3e9c95cdacb655ba.tar.gz CMake-916b7d519557d4d11e73e66c3e9c95cdacb655ba.tar.bz2 | |
Merge branch 'find_package-restore-considered-configs' into release-3.9
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 3 |
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; |