X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fe1e3cca5bb3ef3d4ed2d2940eac845ed956f90..f924b8a615aa062dbac23bd8b7d7863fc045de4b:/buildtools/Cmake/src/CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 547f4c2ac7..2f076e4808 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -1,23 +1,22 @@
 ### Make Libs
 
-if(supernovae)
+if(enable_supernovae)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeSupernovae.txt)
-else(supernovae)	
+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})
-endif(supernovae)
+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_H)
-	add_library(simgrid_ruby STATIC ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
-	set(RUBY_DEP "-lm -module")
-	target_link_libraries(simgrid_ruby 	simgrid ${RUBY_DEP} -fprofile-arcs)
-endif(HAVE_RUBY_H)
+if(HAVE_RUBY)
+	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")
 	add_definitions("-D_XOPEN_SOURCE")
@@ -36,16 +35,17 @@ endif(pthread)
 
 if(HAVE_LUA)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")
+	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)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
-if(NOT HAVE_RUBY_H)
-	string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
-	string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
-endif(NOT HAVE_RUBY_H)
+if(HAVE_POSIX_GETTIME)
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
+	SET(GRAS_DEP "${GRAS_DEP} -lrt")
+endif(HAVE_POSIX_GETTIME)
 
 target_link_libraries(simgrid 	${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static	${SIMGRID_DEP} -fprofile-arcs)
@@ -58,7 +58,9 @@ target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
-#tools
+#src/testall
+add_subdirectory(${PROJECT_DIRECTORY}/src)
+
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
@@ -125,24 +127,20 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 if(HAVE_JAVA)
+	foreach(file ${JMSG_JAVA_SRC})
+		set(java_src_to_compile "${java_src_to_compile} ${file}")	
+	endforeach(file ${JMSG_JAVA_SRC})
 
 	add_custom_command(TARGET simgrid
-	POST_BUILD
-	COMMAND echo "[  0%] Building JAR object src/simgrid.jar"
 	COMMAND /bin/sh ${PROJECT_DIRECTORY}/make_simgrid_java.sh
-	COMMAND echo "[100%] Building JAR object src/simgrid.jar"
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 	)
 
-	foreach(file ${JMSG_JAVA_SRC})
-		set(java_src_to_compile "${java_src_to_compile} ${file}")	
-	endforeach(file ${JMSG_JAVA_SRC})
-
 file(WRITE	${PROJECT_DIRECTORY}/make_simgrid_java.sh 
 "\#! /bin/sh\n\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -rf ${PROJECT_DIRECTORY}/src/.classes\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/src/simgrid.jar\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${PROJECT_DIRECTORY}/src/simgrid.jar\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY}/src/.classes\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
@@ -153,25 +151,22 @@ file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes -silent . &>/dev/null\n")
-
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "echo \"[ 50%] Building JAR object src/simgrid.jar\"\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes . &>/dev/null\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${PROJECT_DIRECTORY}/examples/java/basic/*.class\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "rm ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "rm -f ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${PROJECT_DIRECTORY}/examples/java/suspend/*.class\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java\n")
 
 endif(HAVE_JAVA)