diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-16 13:12:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-16 13:12:56 (GMT) |
| commit | 185e6a12884433caa65e55a44431bd76f52a9f48 (patch) | |
| tree | e16546d8e1a046c76a4ef9807b75ba84c04f7064 /Source | |
| parent | 7242d812691e95cae578a597161693940447b38c (diff) | |
| parent | f2edccea666662ce93af29e397c50702a675f3f4 (diff) | |
| download | CMake-185e6a12884433caa65e55a44431bd76f52a9f48.zip CMake-185e6a12884433caa65e55a44431bd76f52a9f48.tar.gz CMake-185e6a12884433caa65e55a44431bd76f52a9f48.tar.bz2 | |
Merge branch 'find_package-fix-NO_MODULE' into release-3.15
Merge-request: !3557
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 828488f..1d4a8ed 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -823,8 +823,9 @@ bool cmFindPackageCommand::HandlePackageMode( } } - if (this->Makefile->IsOn("CMAKE_FIND_PACKAGE_PREFER_CONFIG") && !found && - handlePackageModeType == HandlePackageModeType::Config) { + if (this->UseFindModules && !found && + handlePackageModeType == HandlePackageModeType::Config && + this->Makefile->IsOn("CMAKE_FIND_PACKAGE_PREFER_CONFIG")) { // Config mode failed. Allow Module case. result = false; } |