X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b0dd6b0d66292d75446c0b7698c9e93b6613c34d..ea10e88fd41a11386d9e3868d72ab8cb933a4292:/teshsuite/java/CMakeLists.txt

diff --git a/teshsuite/java/CMakeLists.txt b/teshsuite/java/CMakeLists.txt
index e782127f4b..bd5d5b12cd 100644
--- a/teshsuite/java/CMakeLists.txt
+++ b/teshsuite/java/CMakeLists.txt
@@ -1,7 +1,7 @@
-set(semaphoreGC_files  SemaphoreGC)
-set(sleepHostOff_files SleepHostOff)
+set(semaphoregc_files  SemaphoreGC)
+set(sleephostoff_files SleepHostOff)
 
-foreach(example semaphoreGC sleepHostOff)
+foreach(example semaphoregc sleephostoff)
   foreach (filename ${${example}_files} )
     set(sources "${${example}_sources}" "${CMAKE_CURRENT_SOURCE_DIR}/${example}/${filename}.java")
   endforeach()
@@ -9,24 +9,17 @@ foreach(example semaphoreGC sleepHostOff)
   set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh)
 
   if(enable_java)
-    add_custom_command(
-      COMMENT "Building ${example}..."
-      OUTPUT  ${example}_compiled
-      DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-      COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR} ${sources}
-      COMMAND ${CMAKE_COMMAND} -E remove ${example}/${example}_compiled
-      COMMAND ${CMAKE_COMMAND} -E touch ${example}/${example}_compiled
-    )
-    add_custom_target(${example} ALL DEPENDS ${example}_compiled)
-    set_target_properties(${example}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
+    string (REPLACE "-" "/" example_dir ${example})
+    add_jar(java-${example} SOURCES ${sources}
+            INCLUDE_JARS simgrid-java_jar
+            OUTPUT_NAME ${example}
+            OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/${example_dir})
+    add_dependencies(java-all java-${example})
+
+    ADD_TESH(tesh-java-${example}  --setenv javacmd=${Java_JAVA_EXECUTABLE} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${TESH_LIBRARY_PATH} --setenv classpath=${TESH_CLASSPATH}${TESH_CLASSPATH_SEPARATOR}${example}.jar --cd ${CMAKE_BINARY_DIR}/teshsuite/java/${example_dir}  ${CMAKE_HOME_DIRECTORY}/teshsuite/java/${example_dir}/${example}.tesh)
   endif()
   set(examples_src ${examples_src} ${sources})
 endforeach()
 
-set(examples_src ${examples_src} ${sources}                                                    PARENT_SCOPE)
+set(examples_src ${examples_src}                                                               PARENT_SCOPE)
 set(tesh_files   ${tesh_files}                                                                 PARENT_SCOPE)
-
-if(enable_java)
-  ADD_TESH(tesh-java-semaphoreGC  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java/semaphoreGC  ${CMAKE_HOME_DIRECTORY}/teshsuite/java/semaphoreGC/SemaphoreGC.tesh)
-  ADD_TESH(tesh-java-sleepHostOff --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java/sleepHostOff ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleepHostOff/SleepHostOff.tesh)
-endif()