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

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 2d550fb443..bfeb0e6e9e 100644
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -7,19 +7,21 @@ if(supernovae)
 else(supernovae)
 	add_library(simgrid SHARED ${simgrid_sources})
 	add_library(gras SHARED ${gras_sources})
-	add_library(smpi SHARED ${SMPI_SRC})
+	add_library(smpi STATIC ${SMPI_SRC})
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
 set(SIMGRID_DEP "")
+set(SMPI_DEP "")
+
 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(SIMGRID_DEP ${SIMGRID_DEP}pthread)
 		SET(ESPACE " ")
 	endif(with_context MATCHES pthread)
 	
@@ -36,15 +38,14 @@ 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}-fprofile-arcs)
+target_link_libraries(gras 	${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(smpi 	${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
@@ -100,6 +101,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)
 
@@ -110,7 +112,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}")