Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Oups, variable names are not same. Fix the bug with Supernovae.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 23 Sep 2010 09:51:26 +0000 (09:51 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 23 Sep 2010 09:51:26 +0000 (09:51 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8204 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/CTestConfig.cmake
buildtools/Cmake/Supernovae.cmake
buildtools/pipol/Nightly_simgrid.sh

index 5756545..4371126 100644 (file)
@@ -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)
 
        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)
        SET(BUILDNAME "SUPERNOVAE" CACHE TYPE INTERNAL FORCE)
-endif(supernovae)
+endif(enable_supernovae)
 
 if(HAVE_GTNETS)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
 
 if(HAVE_GTNETS)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
index 424e7d0..f7f461b 100644 (file)
@@ -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(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
 endif(enable_smpi)
\ No newline at end of file
index cf3b4b7..4829ba7 100644 (file)
@@ -85,7 +85,7 @@ ctest -D NightlySubmit
 make clean
 
 #Make the supernovae mode
 make clean
 
 #Make the supernovae mode
-cmake -Dsupernovae=on ./
+cmake -Denable_supernovae=on ./
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
 ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild