mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'find_package-fix-NO_MODULE' into release-3.15

Browse Source 
Merge-request: !3557
This commit is contained in:
Brad King
2019-07-16 09:12:56 -04:00
parent 7242d81269 f2edccea66
commit 185e6a1288
4 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFindPackageCommand.cxx
+3 -2
View File
@@ -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;
}
Tests/FindPackageTest/CMakeLists.txt
+33
View File
@@ -579,6 +579,26 @@ endif()
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
set(CMAKE_PREFIX_PATH)
set(CMAKE_MODULE_PATH)
############################################################################
##Test FIND_PACKAGE CMAKE_FIND_PACKAGE_PREFER_CONFIG - Do not recurse
# No CMAKE_PREFIX_PATH
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/PreferConfigRecurse)
# Now prefer config mode
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
unset(ACME_FOUND)
unset(ACME_CONFIG)
find_package(ACME)
if(ACME_FOUND AND ACME_CONFIG)
message(SEND_ERROR "Incorrectly found ACME in CONFIG mode, from the MODULE package")
endif()
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
set(CMAKE_MODULE_PATH)
############################################################################
##Test find_package CMAKE_FIND_PACKAGE_PREFER_CONFIG with module fallback
@@ -592,3 +612,16 @@ find_package(ACME REQUIRED)
if(NOT ACME_FOUND)
message(SEND_ERROR "Did not find ACME package")
endif()
############################################################################
##Test find_package CMAKE_FIND_PACKAGE_PREFER_CONFIG with NO_MODULE
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/PreferConfigOnlyModule)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
find_package(ACME NO_MODULE)
if(ACME_FOUND)
message(SEND_ERROR "Should not find ACME package")
endif()
Tests/FindPackageTest/PreferConfigRecurse/ACMEConfig.cmake
+1
View File
@@ -0,0 +1 @@
set(ACME_FOUND TRUE)
Tests/FindPackageTest/PreferConfigRecurse/FindACME.cmake
+1
View File
@@ -0,0 +1 @@
find_package(ACME NO_MODULE)