X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89a7e2ccd01d7f93b1c8b5ffdcc614d081302f61..b527f16c02842442fbf77131ff132efd9ebb42aa:/tools/cmake/Java.cmake diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 3ea59a8d64..72813dcca3 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -115,7 +115,7 @@ if(enable_lib_in_jar) TARGET simgrid-java_jar POST_BUILD COMMENT "Add the native libs into simgrid.jar..." DEPENDS simgrid simgrid-java ${JAVALIBS} - + COMMAND ${CMAKE_COMMAND} -E make_directory ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} @@ -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})