X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7028b5c31213d775d69d164d06673a6dc67fa5a3..69961d7d398539bb53fb07f97a0e9482fc6d872c:/buildtools/Cmake/src/CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 5048685978..4eb4c12423 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -9,12 +9,12 @@ else(enable_supernovae)
 	add_library(smpi STATIC ${SMPI_SRC})
 endif(enable_supernovae)
 
-set(GRAS_DEP "pthread")
-set(SIMGRID_DEP ${libruby})
+set(GRAS_DEP "-lm -lpthread")
+set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)
-	set(SIMGRID_DEP "${SIMGRID_DEP} -lm -module")
+	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)
 
@@ -47,11 +47,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)
@@ -117,6 +112,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)
@@ -136,7 +132,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}"
 	)