Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-18 00:02:21 +08:00
Code Issues Projects Releases Wiki Activity

find_package: Fix prefer-config mode to not fail on missing optional package

Browse Source 
When `CMAKE_FIND_PACKAGE_PREFER_CONFIG` mode was set to `ON`, failure to
find a package was fatal even if it was not `REQUIRED`.  Fix this and
add a test case.

Fixes: #19557
This commit is contained in:
Cristian Adam
2019-08-05 23:46:54 +02:00
committed by Brad King
parent f43a7d76c7
commit 8ed868606d
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

@@ -507,7 +507,9 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args,
loadedPackage = true; loadedPackage = true;
} else { } else {
// The package was not loaded. Report errors. // The package was not loaded. Report errors.
HandlePackageMode(HandlePackageModeType::Module); if (HandlePackageMode(HandlePackageModeType::Module)) {
loadedPackage = true;
}
} }
} }
} else { } else {

6
Tests/FindPackageTest/CMakeLists.txt
View File

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