Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 55d24d0..8935538 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -113,7 +113,7 @@ cmake -G"$GENERATOR"\
   -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
-  -Denable_compile_warnings=ON -Denable_smpi=ON \
+  -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \
   -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \