X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea07feaa52a8efee7a96a1d4322dcf1105bc0df3..1055bda9e0ceab0f8f185ac2ddf1c3c956fe59df:/buildtools/CPACK/src/CMakeMakeExeLib.txt?ds=sidebyside

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 051be866dd..8e173fb793 100644
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -1,44 +1,50 @@
 ### Make Libs
 
-include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
+if(supernovae)
+	include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
+else(supernovae)	
+	add_library(simgrid STATIC ${simgrid_sources})
+	add_library(gras SHARED ${gras_sources})
+	add_library(smpi STATIC ${SMPI_SRC})
+endif(supernovae)
 
-add_library(simgrid SHARED ${simgrid_sources})
-add_library(gras SHARED ${gras_sources})
-add_library(smpi SHARED ${SMPI_SRC})
+set(GRAS_DEP "pthread")
+if(HAVE_RUBY_H)
+	set(SIMGRID_DEP "ruby1.8")
+endif(HAVE_RUBY_H)
+set(SMPI_DEP "")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	add_definitions("-D_XOPEN_SOURCE")
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-set(GRAS_DEP "")
-set(SIMGRID_DEP "")
 
 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)
-	elseif(with_context MATCHES windows)
-		SET(GRAS_DEP pthread)	
+		SET(GRAS_DEP "msg")
 	endif(with_context MATCHES windows)
 endif(pthread)
 
 if(HAVE_LUA)
-	SET(SIMGRID_DEP "${SIMGRID_DEP}${ESPACE}dl lua5.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)
 
-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} pthread -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} -fprofile-arcs)
+target_link_libraries(gras 	${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
 ### Make EXEs
 
 #tools
@@ -62,6 +68,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)
@@ -93,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)