Skip to content

Commit cc7b67a

Browse files
committed
fix ci error
1 parent 2712ae6 commit cc7b67a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ version: 7.0.0.{build}
22

33
branches:
44
only:
5-
- cpp_master
5+
- cpp_master
66

77
environment:
88
matrix:
99
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
1010
cpp11: -DMSGPACK_CXX11=ON
1111
msvc: '"Visual Studio 14 2015"'
12-
boost_prefix: C:\Libraries\boost_1_69_0
12+
boost_prefix: C:\Libraries\boost_1_86_0
1313
boost_subdir: lib32-msvc-14.0
1414
build_script:
1515
- ps: |
@@ -42,7 +42,7 @@ build_script:
4242
-D MSGPACK_BUILD_EXAMPLES=ON `
4343
-D MSGPACK_BUILD_TESTS=ON `
4444
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
45-
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
45+
-D CMAKE_PREFIX_PATH="$env:boost_prefix\$env:boost_subdir\cmake\Boost-1.86.0;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
4646
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
4747
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
4848
..
@@ -52,5 +52,5 @@ build_script:
5252
if ($LastExitCode -ne 0) { exit $LastExitCode }
5353
5454
test_script:
55-
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
56-
- ctest -VV -C Release
55+
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
56+
- ctest -VV -C Release

test-install/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.5...4.0)
22

33
project(test-install LANGUAGES CXX)
44

0 commit comments

Comments
 (0)