Update CPM.cmake (#41)

This commit is contained in:
Lars Melchior
2019-04-26 15:44:36 +02:00
committed by GitHub
parent 76748fe542
commit e558d795f9

View File

@@ -33,6 +33,8 @@ if(CPM_DIRECTORY)
endif() endif()
endif() endif()
set(CPM_VERSION 0.7 CACHE INTERNAL "")
set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "") set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
set(CPM_PACKAGES "" CACHE INTERNAL "") set(CPM_PACKAGES "" CACHE INTERNAL "")
@@ -46,13 +48,8 @@ if(NOT CPM_INDENT)
set(CPM_INDENT "CPM:") set(CPM_INDENT "CPM:")
endif() endif()
function(CPM_REGISTER_PACKAGE PACKAGE VERSION) function(CPMRegisterPackage PACKAGE VERSION)
LIST(APPEND CPM_PACKAGES ${CPM_ARGS_NAME})
set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "") set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "")
CPM_SET_PACKAGE_VERSION(${PACKAGE} ${VERSION})
endfunction()
function(CPM_SET_PACKAGE_VERSION PACKAGE VERSION)
set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} CACHE INTERNAL "") set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} CACHE INTERNAL "")
endfunction() endfunction()
@@ -70,7 +67,6 @@ function(CPM_PARSE_OPTION OPTION)
endfunction() endfunction()
function(CPMAddPackage) function(CPMAddPackage)
set(oneValueArgs set(oneValueArgs
NAME NAME
VERSION VERSION
@@ -125,7 +121,7 @@ function(CPMAddPackage)
return() return()
endif() endif()
CPM_REGISTER_PACKAGE(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION}) CPMRegisterPackage(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})
if (CPM_ARGS_OPTIONS) if (CPM_ARGS_OPTIONS)
foreach(OPTION ${CPM_ARGS_OPTIONS}) foreach(OPTION ${CPM_ARGS_OPTIONS})