Skip to content

Commit a059986

Browse files
committed
Update used CPM.cmake version
1 parent 29c7f17 commit a059986

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

.github/workflows/style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup cmake
2020
uses: jwlawson/[email protected]
2121
with:
22-
cmake-version: 3.18.4
22+
cmake-version: 3.24.4
2323

2424
- uses: actions/setup-python@v4
2525
with:

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup cmake
2828
uses: jwlawson/[email protected]
2929
with:
30-
cmake-version: 3.18.4
30+
cmake-version: 3.24.4
3131

3232
- name: test and install local build
3333
run: |
@@ -57,7 +57,7 @@ jobs:
5757
- name: Setup cmake
5858
uses: jwlawson/[email protected]
5959
with:
60-
cmake-version: 3.18.4
60+
cmake-version: 3.24.4
6161

6262
- name: build for packaging
6363
run: |

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/build
1+
.*.swp
2+
build/
23
/out
34
/.vs
45
/.cache
Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
set(CPM_DOWNLOAD_VERSION 0.35.5)
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.6)
6+
set(CPM_HASH_SUM "3440292907e35353bf0761049d3680e9ed0031443c8ebeb9cbb6a421c4550ec1")
27

38
if(CPM_SOURCE_CACHE)
4-
# Expand relative path. This is important if the provided path contains a tilde (~)
5-
get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
69
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
7-
elseif(DEFINED ENV{CPM_SOURCE_CACHE})
8-
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
10+
elseif(DEFINED $ENV{CPM_SOURCE_CACHE})
11+
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/" "CPM_${CPM_DOWNLOAD_VERSION}.cmake")
912
else()
1013
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
1114
endif()
1215

13-
if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
14-
message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
15-
file(DOWNLOAD
16-
https://github.com/TheLartians/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
17-
${CPM_DOWNLOAD_LOCATION}
18-
)
19-
endif()
16+
# Expand relative path.This is important if the provided path contains a tilde(~)
17+
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
18+
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+
)
2023

2124
include(${CPM_DOWNLOAD_LOCATION})

0 commit comments

Comments
 (0)