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

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 373bc52465..060c256217 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -10,15 +10,14 @@ else(supernovae)
 endif(supernovae)
 
 set(GRAS_DEP "pthread")
-set(SIMGRID_DEP "")
+set(SIMGRID_DEP ${libruby})
 set(SMPI_DEP "")
 
-if(HAVE_RUBY_H)
-	set(SIMGRID_DEP "ruby1.8")
-	add_library(simgrid_ruby STATIC ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
+if(HAVE_RUBY)
+	add_library(simgrid_ruby SHARED ${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)
+endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	add_definitions("-D_XOPEN_SOURCE")
@@ -36,20 +35,39 @@ if(pthread)
 endif(pthread)
 
 if(HAVE_LUA)
-	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -llua5.1")
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
+if(HAVE_POSIX_GETTIME)
+	SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
+	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)
 target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
 
+#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid")
+#SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib")
+
+
 ### Make EXEs
 
+if(enable_maintainer_mode)
+#src
+add_subdirectory(${PROJECT_DIRECTORY}/src)
+endif(enable_maintainer_mode)
+
 #tools
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
@@ -117,27 +135,55 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 if(HAVE_JAVA)
-	message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")
-	exec_program("rm -rf ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("rm ${PROJECT_DIRECTORY}/src/simgrid.jar" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
+
+	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})
-	#message("files java : ${java_src_to_compile}")
-	exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${java_src_to_compile}" OUTPUT_VARIABLE "SIM_COMPILE_OK")	
-	exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes/surf" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("${JAVA_ARCHIVE}" ARGS "cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes ." OUTPUT_VARIABLE "SIM_JAR_OK")
-
-	message("Make examples/java with : ${JAVA_COMPILE}")
-	exec_program("rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("rm ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("rm ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-	exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
+
+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 "mkdir ${PROJECT_DIRECTORY}/src/.classes\n")
+
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${java_src_to_compile}\n")
+
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY}/src/.classes/surf\n")
+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 . &>/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  "\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 "${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 "${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 "${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 "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java\n")
 
 endif(HAVE_JAVA)
+
+