Skip to content

Commit 5607c4b

Browse files
committed
update script and appveyor matrix
1 parent 2f5b137 commit 5607c4b

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ OPTION (MSGPACK_BUILD_EXAMPLES "Build msgpack examples." ON)
8383

8484
SET (Boost_USE_MULTITHREADED ON)
8585
SET (Boost_USE_STATIC_RUNTIME OFF)
86-
FIND_PACKAGE (Boost REQUIRED COMPONENTS chrono context system timer)
86+
FIND_PACKAGE (Boost REQUIRED)
8787

8888
INCLUDE_DIRECTORIES (
8989
${Boost_INCLUDE_DIRS}

appveyor.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ environment:
1111
BOOST_ROOT: C:\Libraries\boost_1_67_0
1212
matrix:
1313
- cpp11: -DMSGPACK_CXX11=OFF
14+
example: -DMSGPACK_BUILD_EXAMPLES=OFF
1415
msvc: '"Visual Studio 10 2010"'
1516
- cpp11: -DMSGPACK_CXX11=OFF
17+
example: -DMSGPACK_BUILD_EXAMPLES=OFF
1618
msvc: '"Visual Studio 11 2012"'
1719
- cpp11: -DMSGPACK_CXX11=OFF
20+
example: -DMSGPACK_BUILD_EXAMPLES=OFF
1821
msvc: '"Visual Studio 12 2013"'
1922
- cpp11: -DMSGPACK_CXX11=ON
23+
example: -DMSGPACK_BUILD_EXAMPLES=ON
2024
msvc: '"Visual Studio 14 2015"'
2125
- cpp11: -DMSGPACK_CXX11=OFF
26+
example: -DMSGPACK_BUILD_EXAMPLES=ON
2227
msvc: '"Visual Studio 14 2015"'
2328
build_script:
2429
- appveyor DownloadFile https://github.com/google/googletest/archive/release-1.7.0.zip -FileName googletest-release-1.7.0.zip
@@ -43,7 +48,7 @@ build_script:
4348
- cd ..
4449
- md build
4550
- cd build
46-
- cmake -G %msvc% %cpp11% %x3_parse% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
51+
- cmake -G %msvc% %cpp11% %example% %x3_parse% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
4752
- cmake --build . --config Release -v
4853

4954
test_script:

0 commit comments

Comments
 (0)