try again, with a more elegant approach to environment variables

This commit is contained in:
Thomas Fussell 2017-03-23 22:31:36 -04:00
parent 7fc5033571
commit a11645b42a

View File

@ -20,19 +20,19 @@ environment:
init: [] init: []
install: install:
- if not exist vcpkg git clone https://github.com/Microsoft/vcpkg - if not exist vcpkg git clone https://github.com/Microsoft/vcpkg
- cd vcpkg - cd vcpkg
- if not exist downloads mkdir downloads - if not exist downloads mkdir downloads
- if not exist downloads\AlwaysAllowDownloads type nul > downloads\AlwaysAllowDownloads - if not exist downloads\AlwaysAllowDownloads type nul > downloads\AlwaysAllowDownloads
- powershell -exec bypass scripts\bootstrap.ps1 - powershell -exec bypass scripts\bootstrap.ps1
- vcpkg install cryptopp:x64-windows zlib:x64-windows expat:x64-windows cryptopp:x86-windows zlib:x86-windows expat:x86-windows - vcpkg install cryptopp:x64-windows zlib:x64-windows expat:x64-windows cryptopp:x86-windows zlib:x86-windows expat:x86-windows
- vcpkg integrate install - vcpkg integrate install
- cd .. - cd ..
before_build: before_build:
- mkdir build - mkdir build
- cd build - cd build
- cmake -G "Visual Studio 14 2015" -D CMAKE_GENERATOR_PLATFORM=%platform% -D STATIC=%STATIC% -D SAMPLES=ON -D BENCHMARKS=ON -D CMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake .. - cmake -G "Visual Studio 14 2015" -D CMAKE_GENERATOR_PLATFORM=%platform% -D STATIC=%STATIC% -D SAMPLES=ON -D BENCHMARKS=ON -D CMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
build: build:
project: build/tests/xlnt.test.sln project: build/tests/xlnt.test.sln
@ -40,6 +40,11 @@ build:
verbosity: minimal verbosity: minimal
test_script: test_script:
- cd build\tests\%configuration% - dir tests
- set PATH=C:\projects\xlnt\vcpkg\installed\%platform%-windows\debug\bin;%PATH% - cd tests\%configuration%
- xlnt.test.exe - if [%platform%]==[Win32] set VCPKG_PLATFORM=x86-windows
- if [%platform%]==[x64] set VCPKG_PLATFORM=x64-windows
- if [%configuration%]==[Debug] set VCPKG_PLATFORM=%VCPKG_PLATFORM%\debug
- set PATH=C:\projects\xlnt\vcpkg\installed\%VCPKG_PLATFORM%\bin;%PATH%
- echo %PATH%
- xlnt.test.exe