Skip to content

Commit afbc20a

Browse files
committed
Bump minimum CMake to 3.26
Signed-off-by: Cristian Le <git@lecris.dev>
1 parent 7b6b6a0 commit afbc20a

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

.github/workflows/cmake.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# (if needed expand this to add all intermediate values
4141
# for *temporary* CI testing)
4242
# - latest version
43-
cmake: ["3.9", "4.0", latest]
43+
cmake: ["3.26", "4.0", latest]
4444
fail-fast: false
4545
steps:
4646

@@ -64,11 +64,8 @@ jobs:
6464
- name: CMake configuration
6565
# TODO: Use cmake presets for newer versions
6666
# TODO: Simplify the defaults to not require configuration
67-
run: |
68-
# CMake<3.13 does not have -B option
69-
mkdir build
70-
cd build
71-
cmake .. \
67+
run: >
68+
cmake -B build \
7269
-G Ninja \
7370
-DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} \
7471
-DBUILD_SHARED_LIBS=ON \
@@ -85,10 +82,5 @@ jobs:
8582
run: >
8683
ctest --output-on-failure
8784
88-
- name: Install (CMake < 3.15)
89-
run: DESTDIR=scalapack_install cmake --build build --target install
90-
if: ${{ matrix.cmake == '3.9' }}
91-
- name: Install (CMake >= 3.15)
85+
- name: Install
9286
run: cmake --install build --prefix scalapack_install
93-
if: ${{ matrix.cmake != '3.9' }}
94-
# TODO: Separate the test suite to be able to test the actual install package

BLACS/INSTALL/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8...4.0)
1+
cmake_minimum_required(VERSION 3.26...4.0)
22
project(INSTALL C Fortran)
33

44
add_executable(xintface Fintface.f Cintface.c)

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.9...4.0)
1+
cmake_minimum_required(VERSION 3.26...4.0)
22

33
project(SCALAPACK VERSION 2.2.2 LANGUAGES C Fortran)
44

0 commit comments

Comments
 (0)