From ee169c4eb5b095d436bd05dc2ef0cbc50af2b4fd Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Fri, 12 May 2017 22:36:20 +0200 Subject: [PATCH] appveyor: Disable boost for non default compiler The appveyor pre-installed software is only compiled with the default compiler and couldn't be used with other compiler versions. Signed-off-by: Stefan Herbrechtsmeier --- appveyor.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5dddf7dd..72c46d8a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,15 +1,19 @@ version: 2.1.0.{build} +image: +- Visual Studio 2015 environment: + global: + BOOST_ROOT: C:\Libraries\boost_1_60_0 matrix: - cpp11: -DMSGPACK_CXX11=OFF - boost: -DMSGPACK_BOOST=ON + boost: -DMSGPACK_BOOST=OFF msvc: '"Visual Studio 10 2010"' - cpp11: -DMSGPACK_CXX11=OFF - boost: -DMSGPACK_BOOST=ON + boost: -DMSGPACK_BOOST=OFF msvc: '"Visual Studio 11 2012"' - cpp11: -DMSGPACK_CXX11=OFF - boost: -DMSGPACK_BOOST=ON + boost: -DMSGPACK_BOOST=OFF msvc: '"Visual Studio 12 2013"' - cpp11: -DMSGPACK_CXX11=ON boost: -DMSGPACK_BOOST=ON @@ -46,7 +50,7 @@ build_script: - cd .. - md build - cd build -- cmake -G %msvc% %cpp11% %boost% %x3_parse% -DMSGPACK_BOOST_DIR=C:\Libraries\\boost_1_60_0 -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"' .. +- cmake -G %msvc% %cpp11% %boost% %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"' .. - cmake --build . --config Release test_script: