Skip to content

Commit e9e06a5

Browse files
authored
Merge pull request #1110 from Zopolis4/appveyedcpp
Fix appveyor for cpp_master
2 parents 2c0040c + 1021aee commit e9e06a5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/depends/zlib.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ while getopts "b:t:p:" c; do
2727
done
2828

2929
mkdir $prefix || exit 1
30-
wget https://zlib.net/zlib-1.3.tar.gz || exit 1
31-
tar -xf zlib-1.3.tar.gz || exit 1
32-
cd zlib-1.3
30+
wget https://zlib.net/zlib-1.3.1.tar.gz || exit 1
31+
tar -xf zlib-1.3.1.tar.gz || exit 1
32+
cd zlib-1.3.1
3333

3434
build()
3535
{

appveyor.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ environment:
2323
boost_subdir: lib32-msvc-14.0
2424
build_script:
2525
- ps: |
26-
appveyor DownloadFile http://zlib.net/zlib-1.3.tar.gz -FileName zlib-1.3.tar.gz
27-
7z x zlib-1.3.tar.gz 2> $null
28-
7z x zlib-1.3.tar 2> $null
29-
cd zlib-1.3
26+
appveyor DownloadFile http://zlib.net/zlib-1.3.1.tar.gz -FileName zlib-1.3.1.tar.gz
27+
7z x zlib-1.3.1.tar.gz 2> $null
28+
7z x zlib-1.3.1.tar 2> $null
29+
cd zlib-1.3.1
3030
3131
md build
3232
md prefix
3333
cd build
3434
3535
cmake `
3636
-G $env:msvc `
37-
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.3\prefix" `
37+
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
3838
..
3939
if ($LastExitCode -ne 0) { exit $LastExitCode }
4040
@@ -52,7 +52,7 @@ build_script:
5252
-D MSGPACK_BUILD_EXAMPLES=ON `
5353
-D MSGPACK_BUILD_TESTS=ON `
5454
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
55-
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3\prefix" `
55+
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
5656
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
5757
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
5858
..
@@ -62,5 +62,5 @@ build_script:
6262
if ($LastExitCode -ne 0) { exit $LastExitCode }
6363
6464
test_script:
65-
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
65+
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
6666
- ctest -VV -C Release

0 commit comments

Comments
 (0)