X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/919d53973306ca235d39729d640610f5dfbaa615..30c845d3e7ecd846a778f91fd12c61db681de5e3:/buildtools/Cmake/src/CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index accba92742..49870b3e95 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -6,19 +6,24 @@ 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 SHARED ${SMPI_SRC})
+	if(enable_smpi)
+		add_library(smpi SHARED ${SMPI_SRC})
+	endif(enable_smpi)
 endif(enable_supernovae)
 
 set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 set_target_properties(gras PROPERTIES VERSION ${libgras_version})
-set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
+if(enable_smpi)
+	set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version})
+endif(enable_smpi)
+
 
 set(GRAS_DEP "-lm -lpthread")
 set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)
-	set(SIMGRID_DEP "${SIMGRID_DEP} -l${libruby} -module")
+	set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -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)
 
@@ -54,7 +59,10 @@ endif(HAVE_POSIX_GETTIME)
 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)
+if(enable_smpi)
+	target_link_libraries(smpi 	simgrid ${SMPI_DEP} -fprofile-arcs)
+endif(enable_smpi)
+
 
 #SET_TARGET_PROPERTIES(simgrid_static PROPERTIES OUTPUT_NAME "simgrid")
 #SET_TARGET_PROPERTIES(simgrid_static PROPERTIES PREFIX "lib")
@@ -129,75 +137,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 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})
-	
-	string(REPLACE ".java" ".class" java_output "${JMSG_JAVA_SRC}")
-	
-#	message("\n\njava_src:\n${JMSG_JAVA_SRC}")
-#	message("\n\njava_src_to_compile:\n${java_src_to_compile}")
-#	message("\n\njava_output:\n${java_output}")	
-
-file(REMOVE_RECURSE ${PROJECT_DIRECTORY}/src/.classes)
-file(REMOVE ${PROJECT_DIRECTORY}/src/simgrid.jar)
-file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/src/.classes)
-file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/src/.classes/surf)
-configure_file(${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd COPYONLY)  
-
-# build .jar file from .class files
-ADD_CUSTOM_TARGET(simgrid.jar ALL
-COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${PROJECT_DIRECTORY}/src/java/simgrid/msg/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND ${CMAKE_COMMAND}
-ARGS -E chdir ${PROJECT_DIRECTORY}
-${JAVA_ARCHIVE} -cvf ${PROJECT_DIRECTORY}/src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes .
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/basic/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/basic/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/suspend/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/suspend/*.java
-)
-
-endif(HAVE_JAVA)
+if(enable_smpi)
+	add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
+endif(enable_smpi)
 
 set(targets_depended_of_gras_stub_generator
 ping_client