X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f885ae2624ab2ba8dad42320b2b1c5be233fbac1..4b30325363e477cc436dda7dbfa85e5076bd8e84:/appveyor.yml diff --git a/appveyor.yml b/appveyor.yml index 67d977287c..ae98a87446 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,13 +18,12 @@ environment: BOOST_LIBRARYDIR: c:\Libraries\boost_1_59_0\stage\lib # BOOST_ROOT: c:\Libraries\boost # BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib - + matrix: - - COMPILER: MSVC15 - PLATFORM: Win32 - COMPILER: MinGW-w64 - PLATFORM: Win32 +# - COMPILER: MSVC15 +# PLATFORM: Win32 # - COMPILER: MSVC15 # PLATFORM: x64 @@ -39,11 +38,11 @@ install: - if [%COMPILER%]==[MSYS2] set PATH=C:\msys64\bin,%PATH% build_script: -- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015" -Denable_smpi=OFF -Denable_mallocators=OFF . -- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64] cmake -G "Visual Studio 14 2015 Win64" -Denable_smpi=OFF -Denable_mallocators=OFF . -- if not [%COMPILER%]==[MSVC15] cmake -G "MinGW Makefiles" -Denable_smpi=OFF -Denable_mallocators=OFF . +- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015" -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF . +- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64] cmake -G "Visual Studio 14 2015 Win64" -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF . +- if not [%COMPILER%]==[MSVC15] cmake -G "MinGW Makefiles" -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . - if [%COMPILER%]==[MSVC15] msbuild ALL_BUILD.vcxproj /verbosity:normal -- if not [%COMPILER%]==[MSVC15] mingw32-make && mingw32-make install +- if not [%COMPILER%]==[MSVC15] mingw32-make test_script: - ctest --output-on-failure