X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77d095374d3f966ce0f54f3837116c73bc3e52e4..a2f39416ee822838ae414f40fc623c8feb7c6730:/tools/cmake/Java.cmake?ds=sidebyside diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 2642a5752a..bd77876cba 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -90,7 +90,8 @@ add_custom_command( COMMAND ${Java_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.trace - COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1 NEWS + COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc + COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} -C ${CMAKE_HOME_DIRECTORY} COPYING -C ${CMAKE_HOME_DIRECTORY} ChangeLog -C ${CMAKE_HOME_DIRECTORY} LICENSE-LGPL-2.1 -C ${CMAKE_HOME_DIRECTORY} NEWS ) ### @@ -127,7 +128,7 @@ if(enable_lib_in_jar) add_custom_command( TARGET simgrid-java_jar POST_BUILD COMMENT "Add the native libs into simgrid.jar..." - DEPENDS simgrid-java + DEPENDS simgrid simgrid-java ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO}