Skip to content

Commit d34cef1

Browse files
committed
remove catch warnings and set correct vs2017 toolset
1 parent bf56e15 commit d34cef1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ jobs:
8383
uses: ilammy/msvc-dev-cmd@v1
8484
with:
8585
arch: x86
86-
toolset: 14.15
86+
toolset: 14.16
8787

8888
- name: Setup MSVC (x64)
8989
if: matrix.platform == 'x64'
9090
uses: ilammy/msvc-dev-cmd@v1
9191
with:
9292
arch: x64
93-
toolset: 14.15
93+
toolset: 14.16
9494

9595
- name: Install Ninja
9696
run: choco install ninja

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Project
2-
cmake_minimum_required(VERSION 3.15)
2+
cmake_minimum_required(VERSION 3.25)
33
project(json_struct VERSION "1.0.3" HOMEPAGE_URL "https://github.com/jorgen/json_struct" DESCRIPTION "A library for parsing JSON directly to C++ structs and vice versa." LANGUAGES CXX)
44
set(CPACK_PACKAGE_VENDOR "Jørgen Lind")
55

@@ -64,6 +64,7 @@ catch2
6464
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
6565
GIT_TAG v3.11.0
6666
GIT_SHALLOW TRUE
67+
SYSTEM
6768
)
6869

6970
FetchContent_MakeAvailable(catch2)

0 commit comments

Comments
 (0)