From 48cf342e2d0859a794e34c8b53c8453229af6fd9 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 7 Feb 2025 11:04:26 +0100 Subject: [PATCH] Switch to the static linking of vpkg ports by default Prefer static linking for now, to bypass the deployment issues. We will switch to dynamic libraries once online installer deliver the vcpkg installed libraries. Change-Id: Iac9a888237742ae886df8fb9b742b45f4727e28a Reviewed-by: Alexandru Croitor --- .../common/shared/triplets/arm64-windows-qt.cmake | 5 ++++- .../provisioning/common/shared/triplets/x64-windows-qt.cmake | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/shared/triplets/arm64-windows-qt.cmake b/coin/provisioning/common/shared/triplets/arm64-windows-qt.cmake index 4d9d5d69..15bd6f58 100644 --- a/coin/provisioning/common/shared/triplets/arm64-windows-qt.cmake +++ b/coin/provisioning/common/shared/triplets/arm64-windows-qt.cmake @@ -2,6 +2,9 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) # Default settings of the triplet from the official vcpkg registry set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) # Qt custom per-port customizations +if(PORT MATCHES "openssl") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/coin/provisioning/common/shared/triplets/x64-windows-qt.cmake b/coin/provisioning/common/shared/triplets/x64-windows-qt.cmake index 856b756e..a36d0011 100644 --- a/coin/provisioning/common/shared/triplets/x64-windows-qt.cmake +++ b/coin/provisioning/common/shared/triplets/x64-windows-qt.cmake @@ -2,6 +2,9 @@ set(VCPKG_TARGET_ARCHITECTURE x64) # Default settings of the triplet from the official vcpkg registry set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) # Qt custom per-port customizations +if(PORT MATCHES "openssl") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif()