X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c17d7e5f5bfaf161f82fc92d38a09102f07dc41..00ac695da387feab357e3fae074c62396be1fe64:/buildtools/Cmake/src/CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index cceeba2021..d22d33d985 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -6,16 +6,20 @@ else(enable_supernovae)
 	add_library(simgrid SHARED ${simgrid_sources})
 	add_library(simgrid_static STATIC ${simgrid_sources})
 	add_library(gras SHARED ${gras_sources})
-	add_library(smpi STATIC ${SMPI_SRC})
+	add_library(smpi SHARED ${SMPI_SRC})
 endif(enable_supernovae)
 
-set(GRAS_DEP "pthread")
-set(SIMGRID_DEP ${libruby})
+set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
+set_target_properties(gras PROPERTIES VERSION ${libgras_version})
+set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
+
+set(GRAS_DEP "-lm -lpthread")
+set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)
-	set(SIMGRID_DEP "${SIMGRID_DEP} -lm -module")
-	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+	set(SIMGRID_DEP "${SIMGRID_DEP} -l${libruby} -module")
+	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -35,7 +39,7 @@ endif(pthread)
 
 if(HAVE_LUA)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")
-	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.* ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+	exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)
@@ -47,11 +51,6 @@ if(HAVE_POSIX_GETTIME)
 	SET(GRAS_DEP "${GRAS_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)
 
-if(NOT HAVE_RUBY)
-	string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
-	string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
-endif(NOT HAVE_RUBY)
-
 target_link_libraries(simgrid 	${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static	${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras 	${GRAS_DEP} -fprofile-arcs)
@@ -63,12 +62,9 @@ target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
-if(enable_maintainer_mode)
-#src
+#src/testall
 add_subdirectory(${PROJECT_DIRECTORY}/src)
-endif(enable_maintainer_mode)
 
-#tools
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
@@ -120,6 +116,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/parallel_task)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/tracing)
 if(HAVE_GTNETS)
 	add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
 	add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
@@ -139,7 +136,7 @@ if(HAVE_JAVA)
 		set(java_src_to_compile "${java_src_to_compile} ${file}")	
 	endforeach(file ${JMSG_JAVA_SRC})
 
-	add_custom_target(simgrid.jar	ALL
+	add_custom_command(TARGET simgrid
 	COMMAND /bin/sh ${PROJECT_DIRECTORY}/make_simgrid_java.sh
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 	)
@@ -179,4 +176,51 @@ file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJ
 
 endif(HAVE_JAVA)
 
-
+set(targets_depended_of_gras_stub_generator
+ping_client
+ping_server
+ping_simulator
+rpc_client
+rpc_forwarder
+rpc_server
+rpc_simulator
+spawn_child
+spawn_father
+spawn_simulator
+timer_client
+timer_simulator
+chrono_multiplier
+chrono_simulator
+simple_token_node
+simple_token_simulator
+mmrpc_client
+mmrpc_server
+mmrpc_simulator
+all2all_receiver
+all2all_sender
+all2all_simulator
+pmm_master
+pmm_simulator
+pmm_slave
+synchro_philosopher
+synchro_simulator
+properties_alice
+properties_bob
+properties_simulator
+msg_handle_client
+msg_handle_server
+msg_handle_simulator
+empty_main_function
+empty_main_simulator
+small_sleep_function
+small_sleep_simulator
+bandwidth_maestro
+bandwidth_sensor
+bandwidth_simulator
+saturate_maestro
+saturate_sensor
+saturate_simulator
+)
+foreach(file ${targets_depended_of_gras_stub_generator})
+	add_dependencies(${file} gras_stub_generator)
+endforeach(file ${targets_depended_of_gras_stub_generator})