diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-20 14:56:52 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-21 11:59:42 +0000 |
| commit | 9d7437859b2297481db267a5e307e0a3a362c9dd (patch) | |
| tree | f7e41b93f101872e3f59f8c41a4360238d34cd52 /coin/platform_configs/default.yaml | |
| parent | b53dfe6a8645bf185f3eaa69f2c8b8559ac32143 (diff) | |
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 <liang.qi@qt.io>
Diffstat (limited to 'coin/platform_configs/default.yaml')
| -rw-r--r-- | coin/platform_configs/default.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
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' |