Skip to content

Commit 85d3abd

Browse files
committed
update version number, test with cmake 4.0, and a few warning fixes
1 parent 88b016c commit 85d3abd

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.github/workflows/tests.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,35 @@ jobs:
2323
uses: ./.github/actions/quick_cmake
2424
with:
2525
cmake-version: "3.7"
26+
args: "-DUNITS_ENABLE_TESTS=OFF"
2627
if: success() || failure()
2728

2829
- name: Check CMake 3.8
2930
uses: ./.github/actions/quick_cmake
3031
with:
3132
cmake-version: "3.8"
33+
args: "-DUNITS_ENABLE_TESTS=OFF"
3234
if: success() || failure()
3335

3436
- name: Check CMake 3.9
3537
uses: ./.github/actions/quick_cmake
3638
with:
3739
cmake-version: "3.9"
40+
args: "-DUNITS_ENABLE_TESTS=OFF"
3841
if: success() || failure()
3942

4043
- name: Check CMake 3.10
4144
uses: ./.github/actions/quick_cmake
4245
with:
4346
cmake-version: "3.10"
47+
args: "-DUNITS_ENABLE_TESTS=OFF"
4448
if: success() || failure()
4549

4650
- name: Check CMake 3.11 (full)
4751
uses: ./.github/actions/quick_cmake
4852
with:
4953
cmake-version: "3.11"
54+
args: "-DUNITS_ENABLE_TESTS=OFF"
5055
if: success() || failure()
5156

5257
cmake-config-2204:
@@ -59,6 +64,7 @@ jobs:
5964
uses: ./.github/actions/quick_cmake
6065
with:
6166
cmake-version: "3.12"
67+
args: "-DUNITS_ENABLE_TESTS=OFF"
6268
if: success() || failure()
6369

6470
- name: Check CMake 3.13
@@ -173,4 +179,10 @@ jobs:
173179
uses: ./.github/actions/quick_cmake
174180
with:
175181
cmake-version: "3.31"
182+
if: success() || failure()
183+
184+
- name: Check CMake 4.0
185+
uses: ./.github/actions/quick_cmake
186+
with:
187+
cmake-version: "4.0"
176188
if: success() || failure()

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# most of the policies, the new version is better (hence the change). We don't use the
1010
# 3.0...3.17 syntax because of a bug in an older MSVC's built-in and modified CMake 3.11
1111
if(${CMAKE_VERSION} VERSION_GREATER 3.22)
12-
cmake_minimum_required(VERSION 3.22...3.31)
12+
cmake_minimum_required(VERSION 3.22...4.0)
1313
else()
1414
cmake_minimum_required(VERSION 3.0)
1515
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
@@ -23,7 +23,7 @@ endif()
2323
project(
2424
${UNITS_CMAKE_PROJECT_NAME}
2525
LANGUAGES C CXX
26-
VERSION 0.12.3
26+
VERSION 0.13.0
2727
)
2828
include(CMakeDependentOption)
2929
include(CTest)

0 commit comments

Comments
 (0)