From dd0a6e302bcda4cdc21a29f0caa1fa90de50747e Mon Sep 17 00:00:00 2001 From: Schaich Alonso Date: Fri, 20 Oct 2023 08:13:30 +0000 Subject: [PATCH] Add visual studio 2022 project file CI runs --- .github/workflows/build-and-test.yml | 24 +++++ CMakePresets.json | 145 +++++++++++++++++++-------- 2 files changed, 127 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index bf6c70b..0cee3da 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -41,6 +41,30 @@ jobs: build_type: 'release' mono: 'mono' os: 'ubuntu-22.04' + - generator: 'vs2022' + vcpkg_target_triplet: 'x64-windows' + build_type: 'debug' + mono: '' + os: 'windows-2022' + VsDevShellArch: 'amd64' + - generator: 'vs2022' + vcpkg_target_triplet: 'x64-windows' + build_type: 'release' + mono: '' + os: 'windows-2022' + VsDevShellArch: 'amd64' + - generator: 'vs2022' + vcpkg_target_triplet: 'x64-windows-static' + build_type: 'debug' + mono: '' + os: 'windows-2022' + VsDevShellArch: 'amd64' + - generator: 'vs2022' + vcpkg_target_triplet: 'x64-windows-static' + build_type: 'release' + mono: '' + os: 'windows-2022' + VsDevShellArch: 'amd64' permissions: contents: read diff --git a/CMakePresets.json b/CMakePresets.json index 8cbbae3..53f9608 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -30,7 +30,7 @@ }, "inherits": [ "base" ] }, - + { "name": "ci", "binaryDir": "${sourceDir}/build", @@ -51,6 +51,11 @@ "generator": "Ninja Multi-Config", "hidden": true }, + { + "name": "vs2022", + "generator": "Visual Studio 17 2022", + "hidden": true + }, { "name": "x64-freebsd", "cacheVariables": { @@ -80,86 +85,102 @@ }, "hidden": true }, - + { "name": "ci-make-x64-linux-release", - "inherits": ["ci", "make", "x64-linux", "release"] + "inherits": [ "ci", "make", "x64-linux", "release" ] }, { "name": "ci-make-x64-linux-debug", - "inherits": ["ci", "make", "x64-linux", "debug"] + "inherits": [ "ci", "make", "x64-linux", "debug" ] }, { "name": "ci-make-x64-freebsd-release", - "inherits": ["ci", "make", "x64-freebsd", "release"] + "inherits": [ "ci", "make", "x64-freebsd", "release" ] }, { "name": "ci-make-x64-freebsd-debug", - "inherits": ["ci", "make", "x64-freebsd", "debug"] + "inherits": [ "ci", "make", "x64-freebsd", "debug" ] }, { "name": "ci-ninja-x64-freebsd-release", - "inherits": ["ci", "ninja", "x64-freebsd", "release"] + "inherits": [ "ci", "ninja", "x64-freebsd", "release" ] }, { "name": "ci-ninja-x64-freebsd-debug", - "inherits": ["ci", "ninja", "x64-freebsd", "debug"] + "inherits": [ "ci", "ninja", "x64-freebsd", "debug" ] }, { "name": "ci-ninja-x64-linux-release", - "inherits": ["ci", "ninja", "x64-linux", "release"] + "inherits": [ "ci", "ninja", "x64-linux", "release" ] }, { "name": "ci-ninja-x64-linux-debug", - "inherits": ["ci", "ninja", "x64-linux", "debug"] + "inherits": [ "ci", "ninja", "x64-linux", "debug" ] }, { "name": "ci-ninja-x64-windows-release", - "inherits": ["ci", "ninja", "x64-windows", "release"] + "inherits": [ "ci", "ninja", "x64-windows", "release" ] }, { "name": "ci-ninja-x64-windows-debug", - "inherits": ["ci", "ninja", "x64-windows", "debug"] + "inherits": [ "ci", "ninja", "x64-windows", "debug" ] }, { "name": "ci-ninja-x64-windows-static-release", - "inherits": ["ci", "ninja", "x64-windows-static", "release"] + "inherits": [ "ci", "ninja", "x64-windows-static", "release" ] }, { "name": "ci-ninja-x64-windows-static-debug", - "inherits": ["ci", "ninja", "x64-windows-static", "debug"] + "inherits": [ "ci", "ninja", "x64-windows-static", "debug" ] }, { "name": "ci-ninjamulti-x64-freebsd-release", - "inherits": ["ci", "ninjamulti", "x64-freebsd", "release"] + "inherits": [ "ci", "ninjamulti", "x64-freebsd", "release" ] }, { "name": "ci-ninjamulti-x64-freebsd-debug", - "inherits": ["ci", "ninjamulti", "x64-freebsd", "debug"] + "inherits": [ "ci", "ninjamulti", "x64-freebsd", "debug" ] }, { "name": "ci-ninjamulti-x64-linux-release", - "inherits": ["ci", "ninjamulti", "x64-linux", "release"] + "inherits": [ "ci", "ninjamulti", "x64-linux", "release" ] }, { "name": "ci-ninjamulti-x64-linux-debug", - "inherits": ["ci", "ninjamulti", "x64-linux", "debug"] + "inherits": [ "ci", "ninjamulti", "x64-linux", "debug" ] }, { "name": "ci-ninjamulti-x64-windows-release", - "inherits": ["ci", "ninjamulti", "x64-windows", "release"] + "inherits": [ "ci", "ninjamulti", "x64-windows", "release" ] }, { "name": "ci-ninjamulti-x64-windows-debug", - "inherits": ["ci", "ninjamulti", "x64-windows", "debug"] + "inherits": [ "ci", "ninjamulti", "x64-windows", "debug" ] }, { "name": "ci-ninjamulti-x64-windows-static-release", - "inherits": ["ci", "ninjamulti", "x64-windows-static", "release"] + "inherits": [ "ci", "ninjamulti", "x64-windows-static", "release" ] }, { "name": "ci-ninjamulti-x64-windows-static-debug", - "inherits": ["ci", "ninjamulti", "x64-windows-static", "debug"] + "inherits": [ "ci", "ninjamulti", "x64-windows-static", "debug" ] + }, + { + "name": "ci-vs2022-x64-windows-release", + "inherits": [ "ci", "vs2022", "x64-windows", "release" ] + }, + { + "name": "ci-vs2022-x64-windows-debug", + "inherits": [ "ci", "vs2022", "x64-windows", "debug" ] + }, + { + "name": "ci-vs2022-x64-windows-static-release", + "inherits": [ "ci", "vs2022", "x64-windows-static", "release" ] + }, + { + "name": "ci-vs2022-x64-windows-static-debug", + "inherits": [ "ci", "vs2022", "x64-windows-static", "debug" ] } ], "buildPresets": [ @@ -272,6 +293,26 @@ "name": "ci-ninjamulti-x64-windows-static-release", "configurePreset": "ci-ninjamulti-x64-windows-static-release", "configuration": "Release" + }, + { + "name": "ci-vs2022-x64-windows-debug", + "configurePreset": "ci-vs2022-x64-windows-debug", + "configuration": "Debug" + }, + { + "name": "ci-vs2022-x64-windows-release", + "configurePreset": "ci-vs2022-x64-windows-release", + "configuration": "Release" + }, + { + "name": "ci-vs2022-x64-windows-static-debug", + "configurePreset": "ci-vs2022-x64-windows-static-debug", + "configuration": "Debug" + }, + { + "name": "ci-vs2022-x64-windows-static-release", + "configurePreset": "ci-vs2022-x64-windows-static-release", + "configuration": "Release" } ], "testPresets": [ @@ -296,102 +337,122 @@ { "name": "ci-make-x64-freebsd-debug", "configurePreset": "ci-make-x64-freebsd-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-make-x64-freebsd-release", "configurePreset": "ci-make-x64-freebsd-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-make-x64-linux-debug", "configurePreset": "ci-make-x64-linux-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-make-x64-linux-release", "configurePreset": "ci-make-x64-linux-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninja-x64-freebsd-debug", "configurePreset": "ci-ninja-x64-freebsd-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninja-x64-freebsd-release", "configurePreset": "ci-ninja-x64-freebsd-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninja-x64-linux-debug", "configurePreset": "ci-ninja-x64-linux-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninja-x64-linux-release", "configurePreset": "ci-ninja-x64-linux-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninja-x64-windows-debug", "configurePreset": "ci-ninja-x64-windows-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninja-x64-windows-release", "configurePreset": "ci-ninja-x64-windows-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninja-x64-windows-static-debug", "configurePreset": "ci-ninja-x64-windows-static-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninja-x64-windows-static-release", "configurePreset": "ci-ninja-x64-windows-static-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninjamulti-x64-freebsd-debug", "configurePreset": "ci-ninjamulti-x64-freebsd-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninjamulti-x64-freebsd-release", "configurePreset": "ci-ninjamulti-x64-freebsd-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninjamulti-x64-linux-debug", "configurePreset": "ci-ninjamulti-x64-linux-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninjamulti-x64-linux-release", "configurePreset": "ci-ninjamulti-x64-linux-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninjamulti-x64-windows-debug", "configurePreset": "ci-ninjamulti-x64-windows-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninjamulti-x64-windows-release", "configurePreset": "ci-ninjamulti-x64-windows-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] }, { "name": "ci-ninjamulti-x64-windows-static-debug", "configurePreset": "ci-ninjamulti-x64-windows-static-debug", - "inherits": ["ci", "debug"] + "inherits": [ "ci", "debug" ] }, { "name": "ci-ninjamulti-x64-windows-static-release", "configurePreset": "ci-ninjamulti-x64-windows-static-release", - "inherits": ["ci", "release"] + "inherits": [ "ci", "release" ] + }, + { + "name": "ci-vs2022-x64-windows-debug", + "configurePreset": "ci-vs2022-x64-windows-debug", + "inherits": [ "ci", "debug" ] + }, + { + "name": "ci-vs2022-x64-windows-release", + "configurePreset": "ci-vs2022-x64-windows-release", + "inherits": [ "ci", "release" ] + }, + { + "name": "ci-vs2022-x64-windows-static-debug", + "configurePreset": "ci-vs2022-x64-windows-static-debug", + "inherits": [ "ci", "debug" ] + }, + { + "name": "ci-vs2022-x64-windows-static-release", + "configurePreset": "ci-vs2022-x64-windows-static-release", + "inherits": [ "ci", "release" ] } ] }