X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/73cbb3a156b37df3bf0caf3b992dde0d701eeeeb..6e69697a9af6a3491da415b4f8f73f962ed14124:/tools/cmake/Java.cmake diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 24c0994060..5419109684 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -28,6 +28,8 @@ endif() add_library(simgrid-java SHARED ${JMSG_C_SRC}) set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version}) set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON) +set_property(TARGET simgrid-java + APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") target_link_libraries(simgrid-java simgrid) @@ -94,7 +96,7 @@ endif() if(enable_lib_in_jar) set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) - + if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD") set(SG_SYSTEM_NAME GNU/kFreeBSD) endif() @@ -115,9 +117,9 @@ 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} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} ) @@ -163,11 +165,11 @@ endif(APPLE) DEPENDS simgrid simgrid-java ${JAVALIBS} COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} ${JAVA_NATIVE_PATH} - + 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})