X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6d0617e3bab901c3ba1517afa9091d4efe173f5..aec4a150a2f7c9a328729b08d727ddf41817d941:/buildtools/CPACK/src/CMakeMakeExeLib.txt

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index bfeb0e6e9e..530b055740 100644
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -1,18 +1,18 @@
 ### Make Libs
 
-include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
-
 if(supernovae)
 	include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
 else(supernovae)
-	add_library(simgrid SHARED ${simgrid_sources})
+	add_library(simgrid STATIC ${simgrid_sources})
 	add_library(gras SHARED ${gras_sources})
 	add_library(smpi STATIC ${SMPI_SRC})
+	add_library(msg STATIC ${MSG_SRC_bis})
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
 set(SIMGRID_DEP "")
-set(SMPI_DEP "")
+set(SMPI_DEP "simgrid")
+set(MSG_DEP "pthread -lrt -ldl -lcrypt -lm -lc")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions("-D_XOPEN_SOURCE")
@@ -43,10 +43,10 @@ endif(HAVE_GTNETS)
 #set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
 
 #add_definitions (-fprofile-arcs -ftest-coverage)
-target_link_libraries(simgrid 	${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS}-fprofile-arcs)
-target_link_libraries(gras 	${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(simgrid 	${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS} ruby1.8 msg -fprofile-arcs)
+target_link_libraries(gras 	${GRAS_DEP} msg -fprofile-arcs)
 target_link_libraries(smpi 	${SMPI_DEP} -fprofile-arcs)
-
+target_link_libraries(msg 	${MSG_DEP} -fprofile-arcs)
 ### Make EXEs
 
 #tools
@@ -70,6 +70,8 @@ if(NOT init)
 	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
 	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
 	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)
+	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main)
+	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep)
 	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag)
 	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network)
 	add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p)