Compare commits

...

2 Commits

Author SHA1 Message Date
Lars Melchior
bc96556f14 fix argument passing 2021-02-15 15:53:28 +01:00
Lars Melchior
f1093f3840 use one value arg for consistency 2021-02-15 15:50:21 +01:00

View File

@@ -243,8 +243,6 @@ endfunction()
# Download and add a package from source # Download and add a package from source
function(CPMAddPackage) function(CPMAddPackage)
set(flagArgs EXCLUDE_FROM_ALL)
set(oneValueArgs set(oneValueArgs
NAME NAME
FORCE FORCE
@@ -259,11 +257,12 @@ function(CPMAddPackage)
FIND_PACKAGE_ARGUMENTS FIND_PACKAGE_ARGUMENTS
NO_CACHE NO_CACHE
GIT_SHALLOW GIT_SHALLOW
EXCLUDE_FROM_ALL
) )
set(multiValueArgs OPTIONS) set(multiValueArgs OPTIONS)
cmake_parse_arguments(CPM_ARGS "${flagArgs}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}") cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
# Set default values for arguments # Set default values for arguments
@@ -579,7 +578,7 @@ function(cpm_fetch_package PACKAGE DOWNLOAD_ONLY EXCLUDE)
set(CPM_OLD_INDENT "${CPM_INDENT}") set(CPM_OLD_INDENT "${CPM_INDENT}")
set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:")
cpm_add_subdirectory( cpm_add_subdirectory(
${${lower_case_name}_SOURCE_DIR} ${${lower_case_name}_BINARY_DIR} ${EXCLUDE} ${${lower_case_name}_SOURCE_DIR} ${${lower_case_name}_BINARY_DIR} "${EXCLUDE}"
) )
set(CPM_INDENT "${CPM_OLD_INDENT}") set(CPM_INDENT "${CPM_OLD_INDENT}")
endif() endif()