Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[simgrid.git] / examples / java / cloud / CMakeLists.txt

diff --git a/examples/java/cloud/CMakeLists.txt b/examples/java/cloud/CMakeLists.txt
index b06f6f9..00f8996 100644 (file)
--- a/examples/java/cloud/CMakeLists.txt
+++ b/examples/java/cloud/CMakeLists.txt
@@ -1,39 +1,30 @@
-cmake_minimum_required(VERSION 2.6)
-
-set(sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/Cloud.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java
-  )
+set(example java_cloud)
+set(sources ${CMAKE_CURRENT_SOURCE_DIR}/Cloud.java
+            ${CMAKE_CURRENT_SOURCE_DIR}/FinalizeTask.java
+           ${CMAKE_CURRENT_SOURCE_DIR}/Master.java
+           ${CMAKE_CURRENT_SOURCE_DIR}/Slave.java)
 
 if(enable_java)
-  add_custom_target(java_cloud ALL
-    COMMENT "Building java_cloud..."
-    COMMAND ${JAVA_COMPILE} -cp ${CMAKE_BINARY_DIR}/simgrid.jar
-                            -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources})
-  add_dependencies(java_cloud 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)
 endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/cloud.tesh
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(xml_files
   ${xml_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(examples_src
   ${examples_src}
   ${sources}
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)