Skip to content

Commit e46bf86

Browse files
authored
Update .appveyor.yml
Don't re-install boost, fix search paths.
1 parent bbbab47 commit e46bf86

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

Diff for: .appveyor.yml

+17-12
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ image: Visual Studio 2017
33

44
environment:
55
APPVEYOR_SAVE_CACHE_ON_ERROR: true
6+
BOOST_VER: 1_69_0
67
matrix:
78
# 32-bit
89
- VCVARS: vcvarsamd64_x86
910
VCPKG_PLATFORM: x86-windows
10-
VCPKG_BOOST_PLATFORM: x86-windows-static
11-
# LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=32,VS=15,host=windows/42/libfunctionality-binary.7z
11+
# VCPKG_BOOST_PLATFORM: x86-windows-static
1212

1313
# 64-bit
1414
- VCVARS: vcvars64
1515
VCPKG_PLATFORM: x64-windows
16-
VCPKG_BOOST_PLATFORM: x64-windows-static
17-
# LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=64,VS=15,host=windows/42/libfunctionality-binary.7z
18-
16+
#VCPKG_BOOST_PLATFORM: x64-windows-static
17+
1918
cache:
2019
- c:\Tools\vcpkg\installed
2120
- c:\Tools\vcpkg\packages
@@ -28,16 +27,22 @@ install:
2827
- ps: mkdir \tools\vcpkg\ports\libfunctionality
2928
- ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL -OutFile \tools\vcpkg\ports\libfunctionality\CONTROL
3029
- ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake
31-
- vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM%
32-
- vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM%
33-
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
30+
- vcpkg install jsoncpp:%VCPKG_PLATFORM% opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% sdl2:%VCPKG_PLATFORM%
31+
# Grab a qedit header with an MIT license appended from an MS repo
32+
- ps: iwr https://raw.githubusercontent.com/microsoft/MixedRealityCompanionKit/master/SpectatorView/Compositor/CompositorDLL/qedit.h -OutFile \projects\qedit.h
33+
# - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM%
34+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
3435

3536

3637

3738
build_script:
3839
- cmd: >-
3940
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" &&
40-
cmake -GNinja -Bbuild -H. -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe &&
41-
cd build &&
42-
ninja &&
43-
cd ..
41+
cmake -GNinja -Bbuild -H.
42+
-DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
43+
-DBUILD_TESTING=OFF
44+
-DCMAKE_BUILD_TYPE=Release
45+
-DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe
46+
-DCMAKE_PREFIX_PATH=C:/Libraries/boost_%BOOST_VER%;C:/Tools/vcpkg/installed/%VCPKG_PLATFORM%;C:/projects &&
47+
-DVCPKG_TARGET_TRIPLET=%VCPKG_PLATFORM%
48+
ninja -C build

0 commit comments

Comments
 (0)