From e558d795f99eb3ad660daae218ffb3b912d984b6 Mon Sep 17 00:00:00 2001 From: Lars Melchior Date: Fri, 26 Apr 2019 15:44:36 +0200 Subject: [PATCH] Update CPM.cmake (#41) --- cmake/CPM.cmake | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 668f257..34242dd 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -33,6 +33,8 @@ if(CPM_DIRECTORY) endif() endif() +set(CPM_VERSION 0.7 CACHE INTERNAL "") + set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "") set(CPM_PACKAGES "" CACHE INTERNAL "") @@ -46,13 +48,8 @@ if(NOT CPM_INDENT) set(CPM_INDENT "CPM:") endif() -function(CPM_REGISTER_PACKAGE PACKAGE VERSION) - LIST(APPEND CPM_PACKAGES ${CPM_ARGS_NAME}) +function(CPMRegisterPackage PACKAGE VERSION) 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 "") endfunction() @@ -70,7 +67,6 @@ function(CPM_PARSE_OPTION OPTION) endfunction() function(CPMAddPackage) - set(oneValueArgs NAME VERSION @@ -125,7 +121,7 @@ function(CPMAddPackage) return() endif() - CPM_REGISTER_PACKAGE(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION}) + CPMRegisterPackage(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION}) if (CPM_ARGS_OPTIONS) foreach(OPTION ${CPM_ARGS_OPTIONS})