From 2b05cf4d00e21f7536f6a02a58a1796486912c92 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 13 Jun 2023 01:49:49 +0400 Subject: [PATCH] Build only release for vcpkg (#17990) --- .ci/azure/android_arm64.yml | 4 +++- vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/azure/android_arm64.yml b/.ci/azure/android_arm64.yml index 29a2e2bf6ec..328309be91d 100644 --- a/.ci/azure/android_arm64.yml +++ b/.ci/azure/android_arm64.yml @@ -145,6 +145,8 @@ jobs: - script: | $(VCPKG_ROOT)/bootstrap-vcpkg.sh --disableMetrics + # patch vcpkg default (community) toolchain to build only Release configuration + echo "set(VCPKG_BUILD_TYPE release)" >> $(VCPKG_ROOT)/triplets/community/arm64-android.cmake displayName: 'Build vcpkg' - task: CMake@1 @@ -153,8 +155,8 @@ jobs: -G Ninja -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) - -DVCPKG_BUILD_TYPE=$(BUILD_TYPE) \ -DVCPKG_TARGET_TRIPLET=arm64-android + -DVCPKG_HOST_TRIPLET=x64-linux-release -DCMAKE_TOOLCHAIN_FILE=$(VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$(ANDROID_NDK_HOME)/build/cmake/android.toolchain.cmake -DCMAKE_COMPILE_WARNING_AS_ERROR=ON diff --git a/vcpkg.json b/vcpkg.json index c59dc50c251..4a0bf27d164 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -14,7 +14,7 @@ "homepage": "https://github.com/openvinotoolkit/openvino", "documentation": "https://docs.openvino.ai/latest/index.html", "license": "Apache-2.0", - "builtin-baseline": "cc968d00bd7b67aa5d0f6b673c1f9da215d644f8", + "builtin-baseline": "63366443439398a62afc9a63b34b9a3ba63b1cae", "dependencies": [ "ade", {