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
introduce new plugin: link_cumload
[simgrid.git]
/
tools
/
cmake
/
Java.cmake
diff --git
a/tools/cmake/Java.cmake
b/tools/cmake/Java.cmake
index
c462643
..
3ea59a8
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)
@@
-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()