github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
pull/502/merge
Lev Stipakov 2022-05-30 15:53:02 +03:00 committed by Samuli Seppänen
parent a85bba9654
commit 271648c6c3
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakePresets.json
View File

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