From 8a9e33d55c215cea17726c82e8519a232bab4896 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Thu, 23 Mar 2017 20:34:33 -0400 Subject: [PATCH] try to build 32 and 64-bit with appveyor. let's see how badly this breaks things --- .appveyor.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d3a4ff59..add1430e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,21 +10,38 @@ cache: environment: matrix: - STATIC: OFF + PLATFORM: Win32 + GENERATOR: "Visual Studio 14 2015" + BUILD_TYPE: Release - STATIC: ON + PLATFORM: Win32 + GENERATOR: "Visual Studio 14 2015" + BUILD_TYPE: Debug + - STATIC: ON + PLATFORM: x64 + GENERATOR: "Visual Studio 14 2015 Win64" + BUILD_TYPE: Release + - STATIC: OFF + PLATFORM: x64 + GENERATOR: "Visual Studio 14 2015 Win64" + BUILD_TYPE: Debug + +configuration: %BUILD_TYPE% init: [] + install: - if not exist vcpkg git clone https://github.com/Microsoft/vcpkg - cd vcpkg - if not exist downloads mkdir downloads - if not exist downloads\AlwaysAllowDownloads type nul > downloads\AlwaysAllowDownloads - powershell -exec bypass scripts\bootstrap.ps1 -- vcpkg install cryptopp:x64-windows zlib:x64-windows expat:x64-windows +- vcpkg install cryptopp:x64-windows zlib:x64-windows expat:x64-windows cryptopp:x86-windows zlib:x86-windows expat:x86-windows - vcpkg integrate install - cd .. before_build: -- cmake -H. -Bbuild -G"Visual Studio 14 2015 Win64" -DSTATIC=%STATIC% -DSAMPLES=ON -DBENCHMARKS=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake +- cmake -H. -Bbuild -G%GENERATOR% -DSTATIC=%STATIC% -DSAMPLES=ON -DBENCHMARKS=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake build: project: build/tests/xlnt.test.sln @@ -32,6 +49,6 @@ build: verbosity: minimal test_script: -- cd build\tests\Debug -- set PATH=C:\projects\xlnt\vcpkg\installed\x64-windows\debug\bin;%PATH% +- cd build\tests\%BUILD_TYPE% +- set PATH=C:\projects\xlnt\vcpkg\installed\%PLATFORM%-windows\debug\bin;%PATH% - xlnt.test.exe