X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..5bd7fca2e9f85f145e02ed5a1e2a18ca81bf6e5a:/tools/cmake/Java.cmake diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index fecf92b3e5..5419109684 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -96,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() @@ -117,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} ) @@ -165,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})