Commit for Cdash test.

[simgrid.git] / buildtools / CPACK / src / CMakeMakeExeLib.txt

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index e59cb2a..8e173fb 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -2,17 +2,17 @@
 
 if(supernovae)
        include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
-else(supernovae)
-       add_library(msg STATIC ${MSG_SRC_bis})
+else(supernovae)       
        add_library(simgrid STATIC ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})
        add_library(smpi STATIC ${SMPI_SRC})
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "ruby1.8")
+if(HAVE_RUBY_H)
+       set(SIMGRID_DEP "ruby1.8")
+endif(HAVE_RUBY_H)
 set(SMPI_DEP "")
-set(MSG_DEP "pthread -lrt -ldl -lcrypt -lm -lc")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        add_definitions("-D_XOPEN_SOURCE")
@@ -42,10 +42,9 @@ endif(HAVE_GTNETS)
 #set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
 
 #add_definitions (-fprofile-arcs -ftest-coverage)
-target_link_libraries(simgrid  msg ${SIMGRID_DEP} -fprofile-arcs)
-target_link_libraries(gras     msg ${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
+target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)
-target_link_libraries(msg      ${MSG_DEP} -fprofile-arcs)
 ### Make EXEs
 
 #tools