From 271648c6c3d37d789205d8b6a1cdabbc100b3ad0 Mon Sep 17 00:00:00 2001
From: Lev Stipakov <lev@openvpn.net>
Date: Mon, 30 May 2022 15:53:02 +0300
Subject: [PATCH] cmake: replace Ninja generator with MSVC

Ninja makes build slightly faster but requires running
"x64" developer command prompt, not the "default" one.
Without that, cmake silenly produces x86 binaries and it might
take a while to find out the reason. To avoid confusion, switch back
to MSVC generator.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 CMakePresets.json | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index 693574f..df4efd0 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -5,6 +5,7 @@
             "name": "base",
             "hidden": true,
             "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "generator": "Visual Studio 16 2019",
             "cacheVariables": {
                 "CMAKE_TOOLCHAIN_FILE": {
                     "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
@@ -29,16 +30,13 @@
         },
         {
             "name": "x64",
-            "generator": "Ninja",
             "hidden": true,
             "architecture": {
-                "value": "x64",
-                "strategy": "external"
+                "value": "x64"
             }
         },
         {
             "name": "arm64",
-            "generator": "Visual Studio 16 2019",
             "hidden": true,
             "architecture": {
                 "value": "arm64"
@@ -46,7 +44,6 @@
         },
         {
             "name": "x86",
-            "generator": "Visual Studio 16 2019",
             "hidden": true,
             "architecture": {
                 "value": "Win32"
@@ -118,11 +115,13 @@
     "buildPresets": [
         {
             "name": "x64-release-ossl3",
-            "configurePreset": "x64-release-ossl3"
+            "configurePreset": "x64-release-ossl3",
+            "configuration": "Release"
         },
         {
             "name": "x64-release-ossl1.1.1",
-            "configurePreset": "x64-release-ossl1.1.1"
+            "configurePreset": "x64-release-ossl1.1.1",
+            "configuration": "Release"
         },
         {
             "name": "x86-release-ossl3",
@@ -146,11 +145,13 @@
         },
         {
             "name": "x64-debug-ossl3",
-            "configurePreset": "x64-debug-ossl3"
+            "configurePreset": "x64-debug-ossl3",
+            "configuration": "Debug"
         },
         {
             "name": "x64-debug-ossl1.1.1",
-            "configurePreset": "x64-debug-ossl1.1.1"
+            "configurePreset": "x64-debug-ossl1.1.1",
+            "configuration": "Debug"
         },
         {
             "name": "x86-debug-ossl3",