Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace deprecated calls to FetchContent_Populate #570

Merged
merged 9 commits into from
Jul 29, 2024
Merged

replace deprecated calls to FetchContent_Populate #570

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
873bbec
replace deprecated calls to FetchContent_Populate
Avus-c Jul 11, 2024
3e052e8
fix: OPTIONS passed to CPMAddPackage not set
Avus-c Jul 15, 2024
aff9803
refactor: remove an unnecessary else branch
Avus-c Jul 15, 2024
82836e6
ci: include cmake 3.30 in test matrix
Avus-c Jul 18, 2024
bf56eda
fix: forward SOURCE_SUBDIR to FetchContent_Declare
Avus-c Jul 18, 2024
77dc92f
fix: only set options if download_only is false
Avus-c Jul 18, 2024
6f2cf67
fix: DOWNLOAD_ONLY test
Avus-c Jul 18, 2024
0e8ca2a
refactor: always use *_Populate to reduce code paths
Avus-c Jul 19, 2024
b416836
Revert "refactor: always use *_Populate to reduce code paths"
Avus-c Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,14 +862,37 @@ function(CPMAddPackage)
)

if(NOT CPM_SKIP_FETCH)
cpm_declare_fetch(
"${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}"
)
# CMake 3.28 added EXCLUDE and SYSTEM(3.25) to FetchContent_Declare.
# Calling FetchContent_MakeAvailable will than call add_subdirectory internally with the EXCLUDE
# and SYSTEM flags. No need for CPM to do this manually anymore.
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
set(fetchContentDeclareExtraArgs "")
if(${CPM_ARGS_EXCLUDE_FROM_ALL})
list(APPEND fetchContentDeclareExtraArgs EXCLUDE_FROM_ALL)
endif()
if(${CPM_ARGS_SYSTEM})
list(APPEND fetchContentDeclareExtraArgs SYSTEM)
endif()
if(CPM_ARGS_OPTIONS)
foreach(OPTION ${CPM_ARGS_OPTIONS})
cpm_parse_option("${OPTION}")
set(${OPTION_KEY} "${OPTION_VALUE}")
endforeach()
endif()

cpm_declare_fetch(
Avus-c marked this conversation as resolved.
Show resolved Hide resolved
"${CPM_ARGS_NAME}"
${fetchContentDeclareExtraArgs}
"${CPM_ARGS_UNPARSED_ARGUMENTS}"
)
else()
cpm_declare_fetch("${CPM_ARGS_NAME}" "${CPM_ARGS_UNPARSED_ARGUMENTS}")
endif()
cpm_fetch_package("${CPM_ARGS_NAME}" populated)
if(CPM_SOURCE_CACHE AND download_directory)
file(LOCK ${download_directory}/../cmake.lock RELEASE)
endif()
if(${populated})
if(${populated} AND ${CMAKE_VERSION} VERSION_LESS "3.28.0")
cpm_add_subdirectory(
"${CPM_ARGS_NAME}"
"${DOWNLOAD_ONLY}"
Expand Down Expand Up @@ -980,7 +1003,7 @@ function(CPMGetPackageVersion PACKAGE OUTPUT)
endfunction()

# declares a package in FetchContent_Declare
function(cpm_declare_fetch PACKAGE VERSION INFO)
function(cpm_declare_fetch PACKAGE)
if(${CPM_DRY_RUN})
cpm_message(STATUS "${CPM_INDENT} Package not declared (dry run)")
return()
Expand Down Expand Up @@ -1071,7 +1094,11 @@ function(cpm_fetch_package PACKAGE populated)
string(TOLOWER "${PACKAGE}" lower_case_name)

if(NOT ${lower_case_name}_POPULATED)
FetchContent_Populate(${PACKAGE})
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
FetchContent_MakeAvailable(${PACKAGE})
else()
FetchContent_Populate(${PACKAGE})
endif()
set(${populated}
TRUE
PARENT_SCOPE
Expand Down