Supernovae with lib msg.

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

diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt
index ab42b2b..c4d2b3e 100644 (file)
--- a/buildtools/CPACK/src/CMakeDefinePackages.txt
+++ b/buildtools/CPACK/src/CMakeDefinePackages.txt
@@ -70,6 +70,15 @@ ${PROJECT_DIRECTORY}/CPACK/src/CTestConfig.cmake
 ${PROJECT_DIRECTORY}/CPACK/src/test_gras_config.h.in
 )
 
+include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
+set(MSG_SRC_bis
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_process.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_host.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg.c
+)
+
 set(EXTRA_DIST 
        ${PROJECT_DIRECTORY}/src/portable.h
        ${PROJECT_DIRECTORY}/src/xbt/mallocator_private.h

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 3a16f86..530b055 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -1,14 +1,5 @@
 ### Make Libs
 
-include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
-set(MSG_SRC_bis
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_process.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_host.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg.c
-)
-
 if(supernovae)
        include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
 else(supernovae)

diff --git a/buildtools/CPACK/src/CMakeSupernovae.txt b/buildtools/CPACK/src/CMakeSupernovae.txt
index 55eeaa4..059b162 100644 (file)
--- a/buildtools/CPACK/src/CMakeSupernovae.txt
+++ b/buildtools/CPACK/src/CMakeSupernovae.txt
@@ -60,6 +60,7 @@ exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src
 exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${temp_src_gras}"   OUTPUT_VARIABLE "SUPER_OK")
 exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src/supernovae_smpi.c ${temp_src_smpi}"   OUTPUT_VARIABLE "SUPER_OK")
 
-add_library(simgrid    SHARED  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
+add_library(simgrid    STATIC  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(gras       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})
 add_library(smpi       STATIC  ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)
+add_library(msg STATIC ${MSG_SRC_bis})