summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-06 13:43:25 (GMT)
committerBrad King <brad.king@kitware.com>2019-08-06 13:43:25 (GMT)
commit9a384e73044f4295a50c8923389b1de832cee36a (patch)
tree7e349e0cbfc504ae659e6407f46c3de0263fea0a /Source
parent1c3404a301959690ca967b0c751c0df1f57a1ecd (diff)
parent8ed868606ddae005b4a50319bdc291b8df5b525a (diff)
downloadCMake-9a384e73044f4295a50c8923389b1de832cee36a.zip
CMake-9a384e73044f4295a50c8923389b1de832cee36a.tar.gz
CMake-9a384e73044f4295a50c8923389b1de832cee36a.tar.bz2
Merge branch 'find_package-prefer-config-not-found' into release-3.15
Merge-request: !3653
Diffstat (limited to 'Source')
-rw-r--r--Source/cmFindPackageCommand.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 1d4a8ed..171fa77 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -507,7 +507,9 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args,
loadedPackage = true;
} else {
// The package was not loaded. Report errors.
- HandlePackageMode(HandlePackageModeType::Module);
+ if (HandlePackageMode(HandlePackageModeType::Module)) {
+ loadedPackage = true;
+ }
}
}
} else {