From 9d7437859b2297481db267a5e307e0a3a362c9dd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Jun 2019 14:56:52 +0200 Subject: Update vcpkg installation Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs/default.yaml') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index f5daef6d..a2e397b1 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -13,4 +13,4 @@ - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' -- cgit v1.2.3