From 50bb9ea7186a464d1ccde40d2234ebc8542701ff Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 20 Oct 2015 00:03:30 +0200 Subject: [PATCH 1/1] [appveyor] switch back to regular boost libs (1_59 was mandatory for MSVC15) --- appveyor.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d01ae94cff..69fc6c4172 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ -# This file is intended to automatize the testing of SimGrid on -# Windows using the appveyor.com continuous integration service +# This file automatize the testing of SimGrid on Windows using the appveyor.com continuous integration service +# +# Build logs: https://ci.appveyor.com/project/mquinson/simgrid os: Visual Studio 2015 version: "{build}" @@ -13,10 +14,10 @@ init: environment: global: - BOOST_ROOT: c:\Libraries\boost_1_59_0 - BOOST_LIBRARYDIR: c:\Libraries\boost_1_59_0\stage\lib - # BOOST_ROOT: c:\Libraries\boost - # BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib + # BOOST_ROOT: c:\Libraries\boost_1_59_0 # Mandatory for MSVC15 right now, but not good on the long term + # BOOST_LIBRARYDIR: c:\Libraries\boost_1_59_0\stage\lib + BOOST_ROOT: c:\Libraries\boost + BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib TESH_ARGS: C:/projects/simgrid/bin/tesh --setenv srcdir=C:/projects/simgrid/examples/java --setenv classpath=C:/projects/simgrid/examples/java;C:/projects/simgrid/teshsuite/java;C:/projects/simgrid/simgrid.jar --cd C:/projects/simgrid/examples/java matrix: - COMPILER: MinGW-w64 -- 2.20.1