Skip to content

Commit 36c69f7

Browse files
committed
Use newer CMake
1 parent 83e0348 commit 36c69f7

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/cuda.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: Install Packages
3131
run: |
32-
sudo apt-get install -y cmake make wget
32+
sudo apt-get install -y wget
3333
3434
- name: Install CUDA
3535
run: |
@@ -41,6 +41,18 @@ jobs:
4141
echo "LD_LIBRARY_PATH=/usr/local/cuda-12.6/lib64:${LD_LIBRARY_PATH}" >> $GITHUB_ENV
4242
echo "CUDA_PATH=/usr/local/cuda-12.6" >> $GITHUB_ENV
4343
44+
- name: Install CMake
45+
run: |
46+
wget https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-x86_64.sh
47+
chmod +x cmake-3.24.0-linux-x86_64.sh
48+
sudo mkdir -p /opt/cmake
49+
sudo ./cmake-3.24.0-linux-x86_64.sh --prefix=/opt/cmake --skip-license
50+
sudo rm -f /usr/local/bin/cmake
51+
sudo ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
52+
53+
- name: Verify CMake version
54+
run: cmake --version
55+
4456
- name: Setup Boost
4557
run: |
4658
echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY

CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Distributed under the Boost Software License, Version 1.0.
55
# https://www.boost.org/LICENSE_1_0.txt
66

7-
cmake_minimum_required(VERSION 3.18)
7+
cmake_minimum_required(VERSION 3.24)
88

99
project(boost_crypt VERSION 1.0.0 LANGUAGES CXX)
1010

@@ -18,12 +18,8 @@ if(BOOST_CRYPT_ENABLE_CUDA)
1818

1919
enable_language(CUDA)
2020

21-
# Let CMake think we want "CUDA17" so it won't fail:
22-
#set(CMAKE_CUDA_STANDARD 17)
23-
#set(CMAKE_CUDA_STANDARD_REQUIRED ON)
24-
25-
# But actually pass C++20 to NVCC:
26-
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --std=c++20")
21+
set(CMAKE_CUDA_STANDARD 20)
22+
set(CMAKE_CUDA_STANDARD_REQUIRED ON)
2723

2824
set(CMAKE_CUDA_EXTENSIONS OFF)
2925

0 commit comments

Comments
 (0)