Skip to content

Commit 5101160

Browse files
authored
Merge branch 'main' into workflow/update-protos
2 parents dbc37e2 + f964f9c commit 5101160

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# TODO: Better clang-format integration (versions, dependencies, only changed, etc.)
2222
# TODO: Version from git describe?
2323
# TODO: Export macros and visibilty annotations
24-
# TODO: CPack? CTest? Conan?
24+
# TODO: CPack? CTest?
2525

2626

2727
# This is a tricky decision. If we set this too old, we lose access to
@@ -32,9 +32,16 @@
3232
# most uses of this product, it is expected to be cross-compiling for
3333
# the target platform on a development system, meaning that we are not
3434
# constrained by the version of CMake available on target systems.
35-
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
3635

37-
set(CMAKE_PROJECT_VERSION 0.7.0)
36+
if (WIN32)
37+
# Use a newer version of CMake on Windows, so we are NEW for
38+
# https://cmake.org/cmake/help/latest/policy/CMP0149.html
39+
cmake_minimum_required(VERSION 3.27 FATAL_ERROR)
40+
else()
41+
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
42+
endif()
43+
44+
set(CMAKE_PROJECT_VERSION 0.8.0)
3845

3946
# Identify the project.
4047
project(viam-cpp-sdk

0 commit comments

Comments
 (0)