X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f371a2501c4503399f53c987a2bb24d1de5dfba2..77221c1956de0a119f6dbb04cf81231d6d035203:/examples/java/priority/CMakeLists.txt

diff --git a/examples/java/priority/CMakeLists.txt b/examples/java/priority/CMakeLists.txt
index d961e0f84a..f254e91e32 100644
--- a/examples/java/priority/CMakeLists.txt
+++ b/examples/java/priority/CMakeLists.txt
@@ -1,38 +1,19 @@
-cmake_minimum_required(VERSION 2.6)
-
-set(sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/Priority.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Test.java
-  )
+set(example java_priority)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Priority.java ${CMAKE_CURRENT_SOURCE_DIR}/Test.java)
 
 if(enable_java)
-  add_custom_target(java_priority ALL
-    COMMENT "Building java_priority..."
-    COMMAND ${JAVA_COMPILE} -cp ${CMAKE_BINARY_DIR}/simgrid.jar
-                            -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources})
-  add_dependencies(java_priority SG_java_jar)
+  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}_compiled
+    COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
+  )
+  add_custom_target(${example} ALL DEPENDS ${example}_compiled)
+  ADD_TESH(java-priority --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/priority/priority.tesh)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/priorityDeployment.xml
-  PARENT_SCOPE
-  )
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE
-  )
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/priorityDeployment.xml  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${sources}                                          PARENT_SCOPE)