From 97100daada7642b5f3fb59c582bdd30346bf6c15 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Mon, 28 Jun 2021 18:10:50 +0300 Subject: [PATCH] Linux vcpkg in ci compile in release only --- 3rdParty/vcpkg_ports/triplets/ci/x64-linux.cmake | 5 +++++ linux/update_vcpkg.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 3rdParty/vcpkg_ports/triplets/ci/x64-linux.cmake diff --git a/3rdParty/vcpkg_ports/triplets/ci/x64-linux.cmake b/3rdParty/vcpkg_ports/triplets/ci/x64-linux.cmake new file mode 100644 index 0000000000..bcf748a9cc --- /dev/null +++ b/3rdParty/vcpkg_ports/triplets/ci/x64-linux.cmake @@ -0,0 +1,5 @@ +set(VCPKG_BUILD_TYPE release) +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/linux/update_vcpkg.sh b/linux/update_vcpkg.sh index 70d308af60..6210f24bf3 100755 --- a/linux/update_vcpkg.sh +++ b/linux/update_vcpkg.sh @@ -8,6 +8,7 @@ fi CACHE_DIR="$PWD/3rdParty/buildCache/linux" BUILD_DIR="$PWD/3rdParty/linux" +VCPKG_PORTS="$PWD/3rdParty/vcpkg_ports" VCPKG_ROOT="$BUILD_DIR/vcpkg" export XDG_CACHE_HOME=$CACHE_DIR/vcpkgcache @@ -19,5 +20,5 @@ fi git -C $VCPKG_ROOT pull $VCPKG_ROOT/bootstrap-vcpkg.sh -$VCPKG_ROOT/vcpkg install rappture curl[core,openssl] --clean-after-build +$VCPKG_ROOT/vcpkg install rappture curl[core,openssl] opencl --clean-after-build --overlay-triplets=$VCPKG_PORTS/triplets/ci $VCPKG_ROOT/vcpkg upgrade --no-dry-run