mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

FetchContent: Don't use if(... IN_LIST ...)

Browse Source 
This avoids the need for changing policy settings, which would then
propagate through to projects brought into the build via FetchContent.
This commit is contained in:
Craig Scott
2022-06-29 07:54:06 +10:00
parent e9213013e6
commit 5c7b6b29f9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/FetchContent.cmake
View File

@@ -1178,7 +1178,11 @@ function(FetchContent_Declare contentName)
# Always check this even if we won't save these details.
# This helps projects catch errors earlier.
if("OVERRIDE_FIND_PACKAGE" IN_LIST ARGN AND "FIND_PACKAGE_ARGS" IN_LIST ARGN)
# Avoid using if(... IN_LIST ...) so we don't have to alter policy settings
list(FIND ARGN OVERRIDE_FIND_PACKAGE index_OVERRIDE_FIND_PACKAGE)
list(FIND ARGN FIND_PACKAGE_ARGS index_FIND_PACKAGE_ARGS)
if(index_OVERRIDE_FIND_PACKAGE GREATER_EQUAL 0 AND
index_FIND_PACKAGE_ARGS GREATER_EQUAL 0)
message(FATAL_ERROR
"Cannot specify both OVERRIDE_FIND_PACKAGE and FIND_PACKAGE_ARGS "
"when declaring details for ${contentName}"
@@ -1750,7 +1754,9 @@ function(__FetchContent_setupFindPackageRedirection contentName)
DEFINED
)
if(NOT wantFindPackage AND NOT OVERRIDE_FIND_PACKAGE IN_LIST contentDetails)
# Avoid using if(... IN_LIST ...) so we don't have to alter policy settings
list(FIND contentDetails OVERRIDE_FIND_PACKAGE indexResult)
if(NOT wantFindPackage AND indexResult EQUAL -1)
# No find_package() redirection allowed
return()
endif()