From 498449dfa07fb409a95031186e313a45b459120d Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Tue, 26 Jan 2021 10:15:31 +0000 Subject: [PATCH] Try to fix vcvars for tests. [skip travis] --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 03da3a3..f092553 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,7 @@ environment: MSVC_CRT_SUFFIX: DLL RUN_EXPORT: false TRIPLET: x64-windows-static-md + VCVARS: vcvars64 matrix: # minimal build @@ -69,6 +70,7 @@ environment: ############### - FEATURES: core,avcodec TRIPLET: x86-windows + VCVARS: vcvars32 matrix: fast_finish: false # known broken features @@ -98,7 +100,7 @@ build_script: .\export.ps1 -triplet $env:TRIPLET -features $env:FEATURES -ErrorAction Stop } test_script: - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\%VCVARS%.bat" - mkdir build-rel - cd build-rel - cmake ../test -G Ninja -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=%TRIPLET% -DFEATURES=%FEATURES:,=;% -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded%MSVC_CRT_SUFFIX%