From 8528134bac3d39db8d36f4097755a97a1394e4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= Date: Fri, 22 May 2026 09:36:40 +0200 Subject: [PATCH] Make OHOS triplets consistent with Android triplets (#51904) --- triplets/community/arm-ohos.cmake | 3 +-- triplets/community/arm64-ohos.cmake | 3 +-- triplets/community/x64-ohos.cmake | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/triplets/community/arm-ohos.cmake b/triplets/community/arm-ohos.cmake index 12578f3b92..53cc32ca3b 100644 --- a/triplets/community/arm-ohos.cmake +++ b/triplets/community/arm-ohos.cmake @@ -1,8 +1,7 @@ set(VCPKG_ENV_PASSTHROUGH_UNTRACKED OHOS_SDK_ROOT) set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME OHOS) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7-unknown-linux-ohos") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DOHOS_ARCH=armeabi-v7a -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON) -set(VCPKG_BUILD_TYPE release) diff --git a/triplets/community/arm64-ohos.cmake b/triplets/community/arm64-ohos.cmake index ac8aacb8ab..056ddc2b89 100644 --- a/triplets/community/arm64-ohos.cmake +++ b/triplets/community/arm64-ohos.cmake @@ -1,8 +1,7 @@ set(VCPKG_ENV_PASSTHROUGH_UNTRACKED OHOS_SDK_ROOT) set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME OHOS) set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-unknown-linux-ohos") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DOHOS_ARCH=arm64-v8a -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON) -set(VCPKG_BUILD_TYPE release) diff --git a/triplets/community/x64-ohos.cmake b/triplets/community/x64-ohos.cmake index 86dec79c02..191d595086 100644 --- a/triplets/community/x64-ohos.cmake +++ b/triplets/community/x64-ohos.cmake @@ -1,8 +1,7 @@ set(VCPKG_ENV_PASSTHROUGH_UNTRACKED OHOS_SDK_ROOT) set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME OHOS) set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-unknown-linux-ohos") set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DOHOS_ARCH=x86_64 -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON) -set(VCPKG_BUILD_TYPE release)