Skip to content

if CPM_LOCAL_PACKAGES_ONLY, make find_package fail if it failed to find. #589

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

if CPM_LOCAL_PACKAGES_ONLY, make find_package fail if it failed to find. #589

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21527a7
if CPM_LOCAL_PACKAGES_ONLY, emit FATAL_ERROR
Arniiiii Aug 19, 2024
011d3dd
if CPM_LOCAL_PACKAGES_ONLY, make `find_package` fail.
Arniiiii Aug 19, 2024
8505423
make warning more verbose
Arniiiii Aug 20, 2024
635d1d6
Also fix it for CPMFindPackage
Arniiiii Aug 20, 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
52 changes: 41 additions & 11 deletions cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,31 @@ function(CPMFindPackage)
return()
endif()

cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})
if(${CPM_USE_LOCAL_PACKAGES})
cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})

if(NOT CPM_PACKAGE_FOUND)
CPMAddPackage(${ARGN})
if(CPM_PACKAGE_FOUND)
cpm_export_variables(${CPM_ARGS_NAME})
return()
else()
string(replace " " ";" EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS
"${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}"
)
message(
warning
"${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS}). The warning emitted bacause cpm_use_local_packages is set to \"${CPM_USE_LOCAL_PACKAGES}\" . Falling back to downloading the package."
)
CPMAddPackage(${ARGN})
cpm_export_variables(${CPM_ARGS_NAME})
endif()
endif()

if(${CPM_LOCAL_PACKAGES_ONLY})
cpm_find_package(
${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" REQUIRED ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}
)
cpm_export_variables(${CPM_ARGS_NAME})
return()
endif()

endfunction()
Expand Down Expand Up @@ -533,7 +553,8 @@ endfunction()
# method to overwrite internal FetchContent properties, to allow using CPM.cmake to overload
# FetchContent calls. As these are internal cmake properties, this method should be used carefully
# and may need modification in future CMake versions. Source:
# https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake#L1152
# https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake
# #L1152
function(cpm_override_fetchcontent contentName)
cmake_parse_arguments(PARSE_ARGV 1 arg "" "SOURCE_DIR;BINARY_DIR" "")
if(NOT "${arg_UNPARSED_ARGUMENTS}" STREQUAL "")
Expand Down Expand Up @@ -716,21 +737,30 @@ function(CPMAddPackage)
endif()

if(NOT CPM_ARGS_FORCE)
if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY)
if(${CPM_USE_LOCAL_PACKAGES})
cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS})

if(CPM_PACKAGE_FOUND)
cpm_export_variables(${CPM_ARGS_NAME})
return()
endif()

if(CPM_LOCAL_PACKAGES_ONLY)
else()
string(replace " " ";" EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS
"${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}"
)
message(
SEND_ERROR
"${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})"
warning
"${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS}). The warning emitted bacause CPM_USE_LOCAL_PACKAGES is set to \"${CPM_USE_LOCAL_PACKAGES}\" . Falling back to downloading the package."
)
endif()
endif()
if(${CPM_LOCAL_PACKAGES_ONLY})
cpm_find_package(
${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" REQUIRED ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}
)

cpm_export_variables(${CPM_ARGS_NAME})
return()
endif()
endif()

CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}")
Expand Down Expand Up @@ -1065,7 +1095,7 @@ function(
list(APPEND addSubdirectoryExtraArgs EXCLUDE_FROM_ALL)
endif()
if("${SYSTEM}" AND "${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.25")
# https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html#prop_dir:SYSTEM
# https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html #prop_dir:SYSTEM
list(APPEND addSubdirectoryExtraArgs SYSTEM)
endif()
if(OPTIONS)
Expand Down