X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49846deceece57c7701293a18b12fece0cf1be94..8bf7ffc43ad5507982e924a7f05bbb13c89965cb:/tools/jenkins/gfortran-simgrid.rc

diff --git a/tools/jenkins/gfortran-simgrid.rc b/tools/jenkins/gfortran-simgrid.rc
index 0024cc6fea..e8ec004ced 100644
--- a/tools/jenkins/gfortran-simgrid.rc
+++ b/tools/jenkins/gfortran-simgrid.rc
@@ -6,12 +6,12 @@ def getcwd():
 prefix=getcwd()+"/install"
 #Add the condition testing to run tests and includes PyYaml
 conditions.add("testing")
-conditions.add("simulation") #to include simgrid compilation
+conditions.add("simulation") #to include SimGrid compilation
 #List the module the this rcfile will build
 modules = ['spred',]
 #example of the potentialities of the python syntax in this file
 def env_configuration():
-    return """--host=x86_64-linux-gnu 'FCFLAGS=-O2 -std=legacy -fopenmp -g -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow,denormal -Wall -fPIC' 'CFLAGS=-O2 -fopenmp -fPIC' 'LDFLAGS=-fopenmp -fPIC' --with-mpi3=false"""
+    return """--host=x86_64-linux-gnu 'FCFLAGS=-O2 -std=legacy -fopenmp -g -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow,denormal -Wall -fPIC' 'CFLAGS=-O2 -fopenmp -fPIC' 'LDFLAGS=-fopenmp -fPIC' 'CXXFLAGS=-Wall -O2 -g -fPIC' LIBS='-lstdc++' --with-mpi3=false"""
 
 #the following command sets the environment variable to give these settings
 #to all the modules
@@ -27,5 +27,5 @@ module_autogenargs.update({
     " --enable-simgrid-shared --with-mpi-libs='-lsimgrid' --with-mpi-include=-I"+getcwd()+"/install/include/smpi FC="+getcwd()+"/install/bin/smpif90 CC=gcc SIMGRID_FC="+getcwd()+"/install/bin/smpif90",
 })
 module_cmakeargs.update({
-'ntpoly': "-DFORTRAN_ONLY=Yes -DCMAKE_Fortran_COMPILER="+getcwd()+"/install/bin/smpif90 -DCMAKE_Fortran_FLAGS_RELEASE='-O2 -fPIC -g -fopenmp' -DBUILD_SHARED_LIBS=Yes"
+'ntpoly': "-DFORTRAN_ONLY=Yes -DCMAKE_Fortran_COMPILER="+getcwd()+"/install/bin/smpif90 -DCMAKE_Fortran_LINK_EXECUTABLE="+getcwd()+"/install/bin/smpif90 -DCMAKE_Fortran_FLAGS_RELEASE='-O3 -fPIC -g -fopenmp -std=legacy'"
 })