Skip to content

Commit cec9cdb

Browse files
committed
Update some dependencies
1 parent 486344d commit cec9cdb

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

Dependencies.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ function(cons_expr_setup_dependencies)
1313
NAME
1414
spdlog
1515
VERSION
16-
1.11.0
16+
1.14.1
1717
GITHUB_REPOSITORY
1818
"gabime/spdlog"
1919
OPTIONS
2020
"SPDLOG_USE_STD_FORMAT ON")
2121
endif()
2222

2323
if(NOT TARGET Catch2::Catch2WithMain)
24-
cpmaddpackage("gh:catchorg/Catch2@3.3.2")
24+
cpmaddpackage("gh:catchorg/Catch2@3.7.0")
2525
endif()
2626

2727
if(NOT TARGET CLI11::CLI11)
28-
cpmaddpackage("gh:CLIUtils/CLI11@2.3.2")
28+
cpmaddpackage("gh:CLIUtils/CLI11@2.4.2")
2929
endif()
3030

3131
if(NOT TARGET ftxui::screen)

cmake/CPM.cmake

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
set(CPM_DOWNLOAD_VERSION 0.38.1)
1+
# SPDX-License-Identifier: MIT
2+
#
3+
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
4+
5+
set(CPM_DOWNLOAD_VERSION 0.40.2)
6+
set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
27

38
if(CPM_SOURCE_CACHE)
49
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@@ -11,23 +16,9 @@ endif()
1116
# Expand relative path. This is important if the provided path contains a tilde (~)
1217
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
1318

14-
function(download_cpm)
15-
message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
16-
file(DOWNLOAD
17-
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
18-
${CPM_DOWNLOAD_LOCATION}
19-
)
20-
endfunction()
21-
22-
if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
23-
download_cpm()
24-
else()
25-
# resume download if it previously failed
26-
file(READ ${CPM_DOWNLOAD_LOCATION} check)
27-
if("${check}" STREQUAL "")
28-
download_cpm()
29-
endif()
30-
unset(check)
31-
endif()
19+
file(DOWNLOAD
20+
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
21+
${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
22+
)
3223

3324
include(${CPM_DOWNLOAD_LOCATION})

0 commit comments

Comments
 (0)