Skip to content

Commit 3365d76

Browse files
committed
Fix appveyor build
1 parent 7b7615a commit 3365d76

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

appveyor.yml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image:
88
- Visual Studio 2015
99
environment:
1010
global:
11-
BOOST_ROOT: C:\Libraries\boost_1_67_0
11+
BOOST_PREFIX: C:\Libraries\boost_1_69_0
1212
matrix:
1313
- cpp11: -DMSGPACK_CXX11=OFF
1414
example: -DMSGPACK_BUILD_EXAMPLES=OFF
@@ -27,34 +27,33 @@ environment:
2727
msvc: '"Visual Studio 14 2015"'
2828
build_script:
2929
- ps: |
30-
appveyor DownloadFile https://github.com/google/googletest/archive/release-1.7.0.zip -FileName googletest-release-1.7.0.zip
31-
7z x googletest-release-1.7.0.zip 2> $null
32-
cd googletest-release-1.7.0
33-
md build
34-
cd build
35-
cmake -G $env:msvc -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS=/D_VARIADIC_MAX=10 ..
36-
cmake --build . --config Release
37-
cd ..
38-
cd ..
3930
appveyor DownloadFile http://zlib.net/zlib-1.2.11.tar.gz -FileName zlib-1.2.11.tar.gz
4031
7z x zlib-1.2.11.tar.gz 2> $null
4132
7z x zlib-1.2.11.tar 2> $null
4233
cd zlib-1.2.11
4334
md build
44-
cd build
45-
cmake -G $env:msvc ..
46-
cmake --build . --config Release
47-
copy zconf.h ..
35+
md prefix
36+
cmake `
37+
-G $env:msvc `
38+
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.11\prefix" `
39+
-B build `
40+
-S .
41+
cmake --build build --target install --config Release
4842
cd ..
49-
cd ..
50-
if ($env:msvc -ne '"Visual Studio 14 2015"') {
51-
((Get-Content CMakeLists.txt) -replace "COMPONENTS chrono system OPTIONAL_COMPONENTS timer", "") | Set-Content -Path CMakeLists.txt
52-
}
43+
5344
md build
54-
cd build
55-
cmake -G $env:msvc $env:cpp11 $env:example $env:x3_parse -DGTEST_LIBRARY="$env:APPVEYOR_BUILD_FOLDER\googletest-release-1.7.0\build\Release\gtest.lib" -DGTEST_MAIN_LIBRARY="$env:APPVEYOR_BUILD_FOLDER\googletest-release-1.7.0\build\Release\gtest_main.lib" -DGTEST_INCLUDE_DIR="$env:APPVEYOR_BUILD_FOLDER\googletest-release-1.7.0\include" -DZLIB_LIBRARY="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.11\build\Release\zlib.lib" -DZLIB_INCLUDE_DIR="$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.11" -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
56-
cmake --build . --config Release -v
45+
cmake `
46+
-G $env:msvc `
47+
$env:cpp11 `
48+
$env:example `
49+
$env:x3_parse `
50+
-D MSGPACK_BUILD_TESTS=ON `
51+
-D CMAKE_PREFIX_PATH="$env:BOOST_PREFIX;$env:APPVEYOR_BUILD_FOLDER\zlib-1.2.11\prefix" `
52+
-D CMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' `
53+
-B build `
54+
-S .
55+
cmake --build build --config Release -v
5756
5857
test_script:
59-
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
58+
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
6059
- ctest -V

0 commit comments

Comments
 (0)