From eedcb6f24ee461cc3db5cd2c7c9bb7a3ff51bbdc Mon Sep 17 00:00:00 2001
From: ClausKlein <claus.klein@arcormail.de>
Date: Thu, 11 Feb 2021 21:34:43 +0100
Subject: [PATCH] update used CMP package versions

---
 cmake/CPM.cmake     | 6 ++++--
 test/CMakeLists.txt | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
index 7e35741..73ee2d0 100644
--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
@@ -1,6 +1,8 @@
-set(CPM_DOWNLOAD_VERSION 0.28.0)
+set(CPM_DOWNLOAD_VERSION 0.28.4)
 
 if(CPM_SOURCE_CACHE)
+  # Expand relative path. This is important if the provided path contains a tilde (~)
+  get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 elseif(DEFINED ENV{CPM_SOURCE_CACHE})
   set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@@ -11,7 +13,7 @@ endif()
 if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
   message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
   file(DOWNLOAD
-       https://github.com/TheLartians/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+       https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
        ${CPM_DOWNLOAD_LOCATION}
   )
 endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ff14a6f..76def2c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,7 +18,7 @@ include(../cmake/CPM.cmake)
 CPMAddPackage(
   NAME doctest
   GITHUB_REPOSITORY onqtam/doctest
-  GIT_TAG 2.3.7
+  GIT_TAG 2.4.5
 )
 
 if(TEST_INSTALLED_VERSION)