Commit 916b7d51 authored by Brad King's avatar Brad King

Merge branch 'find_package-restore-considered-configs' into release-3.9

parents 658ecc1a e7730d78
......@@ -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;
......
......@@ -17,3 +17,5 @@ run_cmake(PackageRoot)
run_cmake(PolicyPush)
run_cmake(PolicyPop)
run_cmake(SetFoundFALSE)
run_cmake(WrongVersion)
run_cmake(WrongVersionConfig)
CMake Warning at SetFoundFALSE.cmake:2 \(find_package\):
Found package configuration file:
.*/Tests/RunCMake/find_package/SetFoundFALSEConfig.cmake
but it set SetFoundFALSE_FOUND to FALSE so package "SetFoundFALSE" is
considered to be NOT FOUND.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
-- Could NOT find SetFoundFALSE \(missing: SetFoundFALSE_DIR\)
set(PACKAGE_VERSION 1)
if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1)
set(PACKAGE_VERSION_COMPATIBLE 1)
endif()
set(PACKAGE_VERSION 2)
if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 2)
set(PACKAGE_VERSION_COMPATIBLE 1)
endif()
^CMake Warning at WrongVersion.cmake:[0-9]+ \(find_package\):
Could not find a configuration file for package "VersionedA" that is
compatible with requested version "3".
The following configuration files were considered but not accepted:
.*/Tests/RunCMake/find_package/VersionedA-[12]/VersionedAConfig.cmake, version: [12]
.*/Tests/RunCMake/find_package/VersionedA-[12]/VersionedAConfig.cmake, version: [12]
Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)$
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
find_package(VersionedA 3)
^CMake Warning at WrongVersionConfig.cmake:[0-9]+ \(find_package\):
Could not find a configuration file for package "VersionedA" that is
compatible with requested version "3".
The following configuration files were considered but not accepted:
.*/Tests/RunCMake/find_package/VersionedA-[12]/VersionedAConfig.cmake, version: [12]
.*/Tests/RunCMake/find_package/VersionedA-[12]/VersionedAConfig.cmake, version: [12]
Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\)$
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
find_package(VersionedA 3)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment