mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-04-17 07:13:27 +02:00
Update zlib to 1.3.1 in appveyor.yml and .github/depends/zlib.sh
This commit is contained in:
parent
2c0040cef6
commit
1021aeea6f
6
.github/depends/zlib.sh
vendored
6
.github/depends/zlib.sh
vendored
@ -27,9 +27,9 @@ while getopts "b:t:p:" c; do
|
||||
done
|
||||
|
||||
mkdir $prefix || exit 1
|
||||
wget https://zlib.net/zlib-1.3.tar.gz || exit 1
|
||||
tar -xf zlib-1.3.tar.gz || exit 1
|
||||
cd zlib-1.3
|
||||
wget https://zlib.net/zlib-1.3.1.tar.gz || exit 1
|
||||
tar -xf zlib-1.3.1.tar.gz || exit 1
|
||||
cd zlib-1.3.1
|
||||
|
||||
build()
|
||||
{
|
||||
|
14
appveyor.yml
14
appveyor.yml
@ -23,10 +23,10 @@ environment:
|
||||
boost_subdir: lib32-msvc-14.0
|
||||
build_script:
|
||||
- ps: |
|
||||
appveyor DownloadFile http://zlib.net/zlib-1.3.tar.gz -FileName zlib-1.3.tar.gz
|
||||
7z x zlib-1.3.tar.gz 2> $null
|
||||
7z x zlib-1.3.tar 2> $null
|
||||
cd zlib-1.3
|
||||
appveyor DownloadFile http://zlib.net/zlib-1.3.1.tar.gz -FileName zlib-1.3.1.tar.gz
|
||||
7z x zlib-1.3.1.tar.gz 2> $null
|
||||
7z x zlib-1.3.1.tar 2> $null
|
||||
cd zlib-1.3.1
|
||||
|
||||
md build
|
||||
md prefix
|
||||
@ -34,7 +34,7 @@ build_script:
|
||||
|
||||
cmake `
|
||||
-G $env:msvc `
|
||||
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.3\prefix" `
|
||||
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
|
||||
..
|
||||
if ($LastExitCode -ne 0) { exit $LastExitCode }
|
||||
|
||||
@ -52,7 +52,7 @@ build_script:
|
||||
-D MSGPACK_BUILD_EXAMPLES=ON `
|
||||
-D MSGPACK_BUILD_TESTS=ON `
|
||||
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
|
||||
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3\prefix" `
|
||||
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
|
||||
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
|
||||
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
|
||||
..
|
||||
@ -62,5 +62,5 @@ build_script:
|
||||
if ($LastExitCode -ne 0) { exit $LastExitCode }
|
||||
|
||||
test_script:
|
||||
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
|
||||
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
|
||||
- ctest -VV -C Release
|
||||
|
Loading…
x
Reference in New Issue
Block a user