mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 14:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'find_package-prefer-config-not-found'

Browse Source 
8ed868606d find_package: Fix prefer-config mode to not fail on missing optional package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3653
This commit is contained in:
Brad King
2019-08-07 13:57:22 +00:00
committed by Kitware Robot
parent e295290ed7 8ed868606d
commit ce14f6c677
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmFindPackageCommand.cxx
View File

@@ -517,7 +517,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 {

6
Tests/FindPackageTest/CMakeLists.txt
View File

@@ -653,3 +653,9 @@ find_package(ACME NO_MODULE)
if(ACME_FOUND)
message(SEND_ERROR "Should not find ACME package")
endif()
############################################################################
##Test find_package CMAKE_FIND_PACKAGE_PREFER_CONFIG with unknown package
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
find_package(DoesNotExist)