@@ -533,7 +533,7 @@ endfunction()
533
533
# method to overwrite internal FetchContent properties, to allow using CPM.cmake to overload
534
534
# FetchContent calls. As these are internal cmake properties, this method should be used carefully
535
535
# and may need modification in future CMake versions. Source:
536
- # https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake#L1152
536
+ # https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake #L1152
537
537
function (cpm_override_fetchcontent contentName)
538
538
cmake_parse_arguments (PARSE_ARGV 1 arg "" "SOURCE_DIR;BINARY_DIR" "" )
539
539
if (NOT "${arg_UNPARSED_ARGUMENTS} " STREQUAL "" )
@@ -716,26 +716,30 @@ function(CPMAddPackage)
716
716
endif ()
717
717
718
718
if (NOT CPM_ARGS_FORCE)
719
- if (CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY )
719
+ if (CPM_USE_LOCAL_PACKAGES)
720
720
cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION} " ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS} )
721
721
722
- string (REPLACE " " ";" EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS "${CPM_ARGS_FIND_PACKAGE_ARGUMENTS} " )
723
-
724
722
if (CPM_PACKAGE_FOUND)
725
723
cpm_export_variables(${CPM_ARGS_NAME} )
726
724
return ()
727
- elseif (CPM_USE_LOCAL_PACKAGES)
728
- message (
729
- WARNING
730
- "${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS} )"
731
- )
732
725
else ()
726
+ string (REPLACE " " ";" EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS
727
+ "${CPM_ARGS_FIND_PACKAGE_ARGUMENTS} "
728
+ )
733
729
message (
734
- FATAL_ERROR
730
+ WARNING
735
731
"${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION} ${EDITED_CPM_ARGS_FIND_PACKAGE_ARGUMENTS} )"
736
732
)
737
733
endif ()
738
734
endif ()
735
+ if (CPM_LOCAL_PACKAGES_ONLY)
736
+ cpm_find_package(
737
+ ${CPM_ARGS_NAME} "${CPM_ARGS_VERSION} " REQUIRED ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}
738
+ )
739
+
740
+ cpm_export_variables(${CPM_ARGS_NAME} )
741
+ return ()
742
+ endif ()
739
743
endif ()
740
744
741
745
CPMRegisterPackage("${CPM_ARGS_NAME} " "${CPM_ARGS_VERSION} " )
@@ -1070,7 +1074,7 @@ function(
1070
1074
list (APPEND addSubdirectoryExtraArgs EXCLUDE_FROM_ALL )
1071
1075
endif ()
1072
1076
if ("${SYSTEM} " AND "${CMAKE_VERSION} " VERSION_GREATER_EQUAL "3.25" )
1073
- # https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html#prop_dir:SYSTEM
1077
+ # https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html #prop_dir:SYSTEM
1074
1078
list (APPEND addSubdirectoryExtraArgs SYSTEM )
1075
1079
endif ()
1076
1080
if (OPTIONS )
0 commit comments