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

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 70cdfc354d..e59cb2a753 100644
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -1,41 +1,40 @@
 ### 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(msg STATIC ${MSG_SRC_bis})
+	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 "")
+set(SIMGRID_DEP "ruby1.8")
 set(SMPI_DEP "")
+set(MSG_DEP "pthread -lrt -ldl -lcrypt -lm -lc")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-	set(SIMGRID_DEP "-D_XOPEN_SOURCE")
+	add_definitions("-D_XOPEN_SOURCE")
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 
 if(pthread)
 	if(with_context MATCHES pthread)
-		SET(SIMGRID_DEP pthread)
-		SET(ESPACE " ")
+		SET(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
 	endif(with_context MATCHES pthread)
 	
 	if(with_context MATCHES windows)
-		SET(GRAS_DEP "")
+		SET(GRAS_DEP "msg")
 	endif(with_context MATCHES windows)
 endif(pthread)
 
 if(HAVE_LUA)
-	SET(SIMGRID_DEP "${SIMGRID_DEP}${ESPACE}-ldl -llua5.1")
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -llua5.1")
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)
-	SET(SIMGRID_DEP_GTNETS "gtnets ")
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
 ### Add definitions for compile
@@ -43,10 +42,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(smpi -fprofile-arcs)
-
+target_link_libraries(simgrid 	msg ${SIMGRID_DEP} -fprofile-arcs)
+target_link_libraries(gras 	msg ${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
+target_link_libraries(msg 	${MSG_DEP} -fprofile-arcs)
 ### Make EXEs
 
 #tools
@@ -70,6 +69,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)
@@ -101,6 +102,7 @@ if(NOT init)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
 	if(HAVE_GTNETS)
+		add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
 		add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
 	endif(HAVE_GTNETS)