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

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 6117a6e458..530b055740 100644
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -1,21 +1,27 @@
 ### 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 SHARED ${SMPI_SRC})
+	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 "simgrid")
+set(MSG_DEP "pthread -lrt -ldl -lcrypt -lm -lc")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	add_definitions("-D_XOPEN_SOURCE")
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
 
 if(pthread)
 	if(with_context MATCHES pthread)
-		SET(SIMGRID_DEP pthread)
+		SET(SIMGRID_DEP ${SIMGRID_DEP}pthread)
 		SET(ESPACE " ")
 	endif(with_context MATCHES pthread)
 	
@@ -32,16 +38,15 @@ if(HAVE_GTNETS)
 	SET(SIMGRID_DEP_GTNETS "gtnets ")
 endif(HAVE_GTNETS)
 
-message("SIMGRID_DEP \"${SIMGRID_DEP}\"")
-message("GRAS_DEP \"${GRAS_DEP}\"")
-
 ### Add definitions for compile
-set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
-add_definitions (${INCLUDES} -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)
-
+#set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
+#set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
+
+#add_definitions (-fprofile-arcs -ftest-coverage)
+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
@@ -65,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)
@@ -96,6 +103,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)
 
@@ -106,7 +114,7 @@ if(NOT init)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
-	#add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
+	add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 	if(HAVE_JAVA)
 		message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")