X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81c3c0394f8a6fa6ef9fbad74529ce5a82081c2a..0ec122a780b6dd27347cca4d240de563e607f349:/examples/java/masterslave/CMakeLists.txt

diff --git a/examples/java/masterslave/CMakeLists.txt b/examples/java/masterslave/CMakeLists.txt
index e0173a3326..fb8fa97cf7 100644
--- a/examples/java/masterslave/CMakeLists.txt
+++ b/examples/java/masterslave/CMakeLists.txt
@@ -1,48 +1,22 @@
-cmake_minimum_required(VERSION 2.6)
-
 set(example java_masterslave)
-set(sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Masterslave.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java
-  )
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Masterslave.java  ${CMAKE_CURRENT_SOURCE_DIR}/Forwarder.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/Master.java ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java  ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java) 
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
-    DEPENDS ${sources} ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    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}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
+  ADD_TESH(java-masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/masterslave/masterslave.tesh)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml
-  PARENT_SCOPE
-  )
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  PARENT_SCOPE
-  )
+set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh           PARENT_SCOPE)
+set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml  PARENT_SCOPE)
+set(examples_src ${examples_src}  ${sources}                                             PARENT_SCOPE)
+set(txt_files  ${txt_files}  ${CMAKE_CURRENT_SOURCE_DIR}/README                          PARENT_SCOPE)