From 96ab9691521b7352b4c13b347dfe9ec9cd2850d9 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 11 Mar 2023 21:52:11 +0100 Subject: [PATCH] build: windows: link MSVC runtime statically --- CMakeLists.txt | 7 +++++++ CMakeSettings.json | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06204010..3ededd63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,13 @@ if (BUILD_NUMBER LESS 5180) "For detailed info: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281") endif() +# +# Link MSVC runtime statically +# this should be revisited after installer migration to MSI +# +cmake_policy(SET CMP0091 NEW) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + project("SoftEther VPN" VERSION "5.02.${BUILD_NUMBER}" LANGUAGES C diff --git a/CMakeSettings.json b/CMakeSettings.json index 77a121fd..fa46663d 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -30,7 +30,7 @@ }, { "name": "VCPKG_TARGET_TRIPLET", - "value": "x64-windows-static-md", + "value": "x64-windows-static", "type": "STRING" } ] @@ -64,7 +64,7 @@ }, { "name": "VCPKG_TARGET_TRIPLET", - "value": "x86-windows-static-md", + "value": "x86-windows-static", "type": "STRING" } ] @@ -98,7 +98,7 @@ }, { "name": "VCPKG_TARGET_TRIPLET", - "value": "x64-windows-static-md", + "value": "x64-windows-static", "type": "STRING" } ] @@ -132,7 +132,7 @@ }, { "name": "VCPKG_TARGET_TRIPLET", - "value": "x86-windows-static-md", + "value": "x86-windows-static", "type": "STRING" } ]