various cleanups in the CMakeLists.txt files

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

diff --git a/examples/java/kademlia/CMakeLists.txt b/examples/java/kademlia/CMakeLists.txt
index b6cdc1a..5289ac8 100644 (file)
--- a/examples/java/kademlia/CMakeLists.txt
+++ b/examples/java/kademlia/CMakeLists.txt
@@ -1,28 +1,15 @@
-cmake_minimum_required(VERSION 2.6)
-
 set(example java_kademlia)
-set(sources
-  ${CMAKE_CURRENT_SOURCE_DIR}/Answer.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Bucket.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Common.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Contact.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeAnswerTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/FindNodeTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Kademlia.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/KademliaTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/Node.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/PingAnswerTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/PingTask.java
-  ${CMAKE_CURRENT_SOURCE_DIR}/RoutingTable.java
-  )
+set(sources Kademlia.java
+  Answer.java Bucket.java Common.java Contact.java FindNodeAnswerTask.java FindNodeTask.java KademliaTask.java Node.java PingAnswerTask.java PingTask.java RoutingTable.java)
 
 if(enable_java)
   add_custom_command(
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
-    DEPENDS ${sources} ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -cp ${SIMGRID_JAR}
+    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)
@@ -31,23 +18,12 @@ endif()
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.tesh
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/kademlia.xml
-  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)