Make lib_in_jar useful to work on Java

diff --git a/examples/deprecated/java/CMakeLists.txt b/examples/deprecated/java/CMakeLists.txt
index ef3f71d..afcdd52 100644 (file)
--- a/examples/deprecated/java/CMakeLists.txt
+++ b/examples/deprecated/java/CMakeLists.txt
@@ -26,6 +26,7 @@ set(hostload_files              Main  LoadRunner)
 if(enable_java)
   add_custom_target(java-all COMMENT "Building all Java examples...")
   add_dependencies(tests java-all)
+  add_dependencies(java-all simgrid-java) # useful when the libs are not included in the jar
 endif()
 
 foreach (example app-bittorrent app-centralizedmutex app-masterworker app-pingpong app-tokenring async-yield async-waitall async-dsend

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index 536b658..72813dc 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -160,7 +160,7 @@ endif(APPLE)
 
   add_custom_command(
     TARGET simgrid-java_jar POST_BUILD
-    COMMENT "Packing back the simgrid.jar with the native libs..."
+    COMMENT "Packing back the simgrid.jar with the native libs (turn lib_in_jar off when coding in java)..."
     DEPENDS simgrid simgrid-java ${JAVALIBS}
 
     COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  ${JAVA_NATIVE_PATH}
@@ -168,7 +168,6 @@ endif(APPLE)
     COMMAND ${CMAKE_COMMAND} -E echo "-- Cmake put the native code in ${JAVA_NATIVE_PATH}"
     COMMAND "${Java_JAVA_EXECUTABLE}" -classpath "${SIMGRID_JAR}" org.simgrid.NativeLib
   )
-
 endif(enable_lib_in_jar)
 
 include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})