schtobia/MyModernCppStarter
1
0
Fork 0
Code Issues Pull requests Activity

Added a download status (#171)

Browse source 
* bump the version of CPM to 0.38.1

* feature: added CPM download status

This is very useful in shaky network solutions. We want both a success
and a failure message, to determine if the download was successful.

* feature: compare CPM against a given checksum

This is more comprehensive than just comparing against an empty file.

* bump the version of Ccache.cmake to 1.2.4

* bump the version of StableCoder/cmake-scripts to 23.04

* update to use new get_cpm.cmake script

---------

Co-authored-by: Lars Melchior <lars.melchior@gmail.com>
This commit is contained in:
Tobias Schmidl 2023-09-18 16:20:20 +02:00 • committed by GitHub
parent f0b5bdb1f5
commit 776d4f36be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmake/CPM.cmake
View file

@ -1,4 +1,9 @@
set(CPM_DOWNLOAD_VERSION 0.37.0)
# SPDX-License-Identifier: MIT
#
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
set(CPM_DOWNLOAD_VERSION 0.38.5)
set(CPM_HASH_SUM "192aa0ccdc57dfe75bd9e4b176bf7fb5692fd2b3e3f7b09c74856fc39572b31c")
if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@ -11,22 +16,9 @@ endif()
# Expand relative path. This is important if the provided path contains a tilde (~)
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
function(download_cpm)
message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
file(DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION}
${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
)
endfunction()
if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
download_cpm()
else()
# resume download if it previously failed
file(READ ${CPM_DOWNLOAD_LOCATION} check)
if("${check}" STREQUAL "")
download_cpm()
endif()
endif()
include(${CPM_DOWNLOAD_LOCATION})

4
cmake/tools.cmake
View file

@ -11,7 +11,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake)
# enables sanitizers support using the the `USE_SANITIZER` flag available values are: Address,
# Memory, MemoryWithOrigins, Undefined, Thread, Leak, 'Address;Undefined'
if(USE_SANITIZER OR USE_STATIC_ANALYZER)
CPMAddPackage("gh:StableCoder/cmake-scripts#1f822d1fc87c8d7720c074cde8a278b44963c354")
CPMAddPackage("gh:StableCoder/cmake-scripts@23.04")
if(USE_SANITIZER)
include(${cmake-scripts_SOURCE_DIR}/sanitizers.cmake)
@ -62,5 +62,5 @@ endif()
# enables CCACHE support through the USE_CCACHE flag possible values are: YES, NO or equivalent
if(USE_CCACHE)
CPMAddPackage("gh:TheLartians/Ccache.cmake@1.2.3")
CPMAddPackage("gh:TheLartians/Ccache.cmake@1.2.4")
endif()