From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Sat, 2 Feb 2013 22:57:40 +0000 (+0100)
Subject: Improve dependencies around simgrid.jar (again).
X-Git-Tag: v3_9_90~525
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/77959bacb839e9a33f46b7b0574950c9d8929d5a?hp=dc7fb5915104be962dc701fa6bf29e8814a61702

Improve dependencies around simgrid.jar (again).
---

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 9b07d59858..0cc8a6ac33 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -47,7 +47,7 @@ if(enable_java)
   endif()
 
   set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
-  add_jar(SG_java_jar ${JMSG_JAVA_SRC})
+  add_jar(SG_java_pre_jar ${JMSG_JAVA_SRC})
 
   set(SIMGRID_JAR "${CMAKE_BINARY_DIR}/simgrid.jar")
   set(MANIFEST_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.MF")
@@ -78,7 +78,8 @@ if(enable_java)
   add_custom_command(
     COMMENT "Finalize simgrid.jar..."
     OUTPUT ${SIMGRID_JAR}_finalized
-    DEPENDS ${SIMGRID_JAR} ${MANIFEST_FILE}
+    DEPENDS simgrid SG_java SG_java_pre_jar
+            ${SIMGRID_JAR} ${MANIFEST_FILE}
             ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
             ${CMAKE_BINARY_DIR}/lib/${LIBSG_JAVA_SO}
             ${CMAKE_HOME_DIRECTORY}/COPYING
@@ -97,8 +98,7 @@ if(enable_java)
     COMMAND ${CMAKE_COMMAND} -E remove ${SIMGRID_JAR}_finalized
     COMMAND ${CMAKE_COMMAND} -E touch ${SIMGRID_JAR}_finalized
     )
-  add_custom_target(SG_java_jar_finalize DEPENDS ${SIMGRID_JAR}_finalized)
-  add_dependencies(SG_java_jar SG_java_jar_finalize)
+  add_custom_target(SG_java_jar ALL DEPENDS ${SIMGRID_JAR}_finalized)
 endif()
 
 add_dependencies(simgrid maintainer_files)