From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 23 Sep 2010 09:51:26 +0000 (+0000)
Subject: Oups, variable names are not same. Fix the bug with Supernovae.
X-Git-Tag: v3_5~620
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9b39bafc27f084e23751d10f11af8d6998cb09c9

Oups, variable names are not same. Fix the bug with Supernovae.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8204 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake
index 5756545ae3..437112699f 100644
--- a/buildtools/Cmake/CTestConfig.cmake
+++ b/buildtools/Cmake/CTestConfig.cmake
@@ -17,9 +17,9 @@ if(enable_compile_warnings AND enable_compile_optimizations)
 	SET(BUILDNAME "FULL_FLAGS" CACHE TYPE INTERNAL FORCE)
 endif(enable_compile_warnings AND enable_compile_optimizations)
 
-if(supernovae)
+if(enable_supernovae)
 	SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
-endif(supernovae)
+endif(enable_supernovae)
 
 if(HAVE_GTNETS)
 	SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
diff --git a/buildtools/Cmake/Supernovae.cmake b/buildtools/Cmake/Supernovae.cmake
index 424e7d07a0..f7f461b5ba 100644
--- a/buildtools/Cmake/Supernovae.cmake
+++ b/buildtools/Cmake/Supernovae.cmake
@@ -65,4 +65,5 @@ add_library(simgrid_static STATIC ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${sim
 add_library(gras 	SHARED 	${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})
 if(enable_smpi)
 	add_library(smpi 	SHARED 	${PROJECT_DIRECTORY}/src/supernovae_smpi.c)
+	add_library(smpi_static STATIC ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)
 endif(enable_smpi)
\ No newline at end of file
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index cf3b4b7fc0..4829ba755d 100644
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -85,7 +85,7 @@ ctest -D NightlySubmit
 make clean
 
 #Make the supernovae mode
-cmake -Dsupernovae=on ./
+cmake -Denable_supernovae=on ./
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild