A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev-add_comm_fault_scenario' into 'master'
[simgrid.git]
/
tools
/
cmake
/
Java.cmake
diff --git
a/tools/cmake/Java.cmake
b/tools/cmake/Java.cmake
index c462643d1b2cc2f4f3b8bae578a98d682ce45046..72813dcca3f2ea86078c43ed2c8700f2e8070f0b 100644
(file)
--- a/
tools/cmake/Java.cmake
+++ b/
tools/cmake/Java.cmake
@@
-3,9
+3,9
@@
## This file is loaded only if the Java option is activated
##
## This file is loaded only if the Java option is activated
##
-find_package(Java 1.
7
COMPONENTS Runtime Development)
+find_package(Java 1.
8
COMPONENTS Runtime Development)
if (NOT ${Java_FOUND})
if (NOT ${Java_FOUND})
- message(FATAL_ERROR "Java not found (need at least Java
7
). Please install the JDK or disable that option")
+ message(FATAL_ERROR "Java not found (need at least Java
8
). Please install the JDK or disable that option")
endif()
set(Java_FOUND 1)
include(UseJava)
endif()
set(Java_FOUND 1)
include(UseJava)
@@
-58,12
+58,7
@@
set(LIBSIMGRID_JAVA_SO ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED
## Here is how to build simgrid.jar
##
## Here is how to build simgrid.jar
##
-if(CMAKE_VERSION VERSION_LESS "2.8.12")
- set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid)
- add_jar(simgrid-java_jar ${JMSG_JAVA_SRC})
-else()
- add_jar(simgrid-java_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
-endif()
+add_jar(simgrid-java_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
if(enable_lib_in_jar)
add_dependencies(simgrid-java_jar simgrid-java)
if(enable_lib_in_jar)
add_dependencies(simgrid-java_jar simgrid-java)
@@
-120,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}
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 make_directory ${JAVA_NATIVE_PATH}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO}
@@
-137,7
+132,8
@@
if(WIN32)
# So let's be brutal and copy it in any case (even on non-windows builds) from the location where appveyor provides it.
# The copy is only expected to work on the appveyor builder, but that's all we need right now
# since our users are directed to download that file as nightly build.
# So let's be brutal and copy it in any case (even on non-windows builds) from the location where appveyor provides it.
# The copy is only expected to work on the appveyor builder, but that's all we need right now
# since our users are directed to download that file as nightly build.
- COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true
)
endif()
)
endif()
@@
-164,7
+160,7
@@
endif(APPLE)
add_custom_command(
TARGET simgrid-java_jar POST_BUILD
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}
DEPENDS simgrid simgrid-java ${JAVALIBS}
COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} ${JAVA_NATIVE_PATH}
@@
-172,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
)
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})
endif(enable_lib_in_jar)
include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})