+##
+## The Cmake definitions for the use of Java (and Scala)
+## This file is loaded only if the Java option is activated
+##
+
cmake_minimum_required(VERSION 2.8.6)
+find_package(Java 1.7 REQUIRED)
include(UseJava)
# Rules to build libsimgrid-java
exec_program("java -d32 -version"
OUTPUT_VARIABLE IS_32_BITS_JVM)
STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION )
- if(${POSITION} GREATER -1)
- message("POTENTIAL ERROR: Java JVM needs to be 32 bits to be able to run with Simgrid on Windows for now")
+ if(NOT ${POSITION} GREATER -1)
+ message(fatal_error "SimGrid can only use Java 64 bits")
endif()
- set_target_properties(simgrid-java PROPERTIES
- LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
- find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
- message(STATUS "pexports: ${PEXPORTS_PATH}")
- if(PEXPORTS_PATH)
- add_custom_command(TARGET simgrid-java POST_BUILD
- COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/simgrid-java.dll > ${CMAKE_BINARY_DIR}/lib/simgrid-java.def)
- endif(PEXPORTS_PATH)
+# Already passed to all targets in GCCFlags.cmake
+# set_target_properties(simgrid-java PROPERTIES
+# LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
+# set_target_properties(surf-java PROPERTIES
+# LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
endif()
# Rules to build simgrid.jar
DEPENDS ${MANIFEST_IN_FILE}
${CMAKE_HOME_DIRECTORY}/COPYING
${CMAKE_HOME_DIRECTORY}/ChangeLog
+ ${CMAKE_HOME_DIRECTORY}/NEWS
${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
COMMAND ${Java_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.surf org.simgrid.trace
- COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1
+ COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc -C ${CMAKE_HOME_DIRECTORY} COPYING ChangeLog ChangeLog.SimGrid-java LICENSE-LGPL-2.1 NEWS
)
###
###
if(enable_lib_in_jar)
+ find_program(STRIP_COMMAND strip)
+ if(NOT STRIP_COMMAND)
+ set(STRIP_COMMAND "cmake -E echo (strip not found)")
+ endif()
+ if(WIN32)
+ set(STRIP_COMMAND "cmake -E echo (dont strip on windows)")
+ endif()
set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO} ${JAVA_NATIVE_PATH}
+
+ # strip seems to fail on Mac on binaries that are already stripped.
+ # It then spits: "symbols referenced by indirect symbol table entries that can't be stripped"
+ COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} || true
+ COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} || true
+ COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO} || true
COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} NATIVE
COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
COMMAND ${CMAKE_COMMAND} -E echo "-- Cmake put the native code in ${JAVA_NATIVE_PATH}"
COMMAND "${Java_JAVA_EXECUTABLE}" -classpath "${SIMGRID_JAR}" org.simgrid.NativeLib
)
- if(MINGW)
- find_library(WINPTHREAD_DLL
- NAME winpthread winpthread-1
- PATHS C:\MinGW C:\MinGW64 C:\MinGW\bin C:\MinGW64\bin
- )
- add_custom_command(
- TARGET simgrid-java_jar POST_BUILD
- COMMENT "Add the MinGW libs into simgrid.jar..."
- DEPENDS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
-
- COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
- COMMAND ${CMAKE_COMMAND} -E make_directory ${JAVA_NATIVE_PATH}
- COMMAND ${CMAKE_COMMAND} -E copy ${WINPTHREAD_DLL} ${JAVA_NATIVE_PATH}
-
- COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} NATIVE
- COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
- )
- endif(MINGW)
+ #if(MINGW)
+ # find_library(WINPTHREAD_DLL
+ # NAME winpthread winpthread-1
+ # PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin
+ # )
+ # add_custom_command(
+ # TARGET simgrid-java_jar POST_BUILD
+ # COMMENT "Add the MinGW libs into simgrid.jar..."
+ # DEPENDS ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}
+ #
+ # COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
+ # COMMAND ${CMAKE_COMMAND} -E make_directory ${JAVA_NATIVE_PATH}
+ # COMMAND ${CMAKE_COMMAND} -E copy ${WINPTHREAD_DLL} ${JAVA_NATIVE_PATH}
+ #
+ # COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} NATIVE
+ # COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
+ # )
+ #endif(MINGW)
endif(enable_lib_in_jar)
include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
add_dependencies(simgrid-java surf-java)
add_dependencies(simgrid-java_jar surf-java)
-if(WIN32)
- set_target_properties(surf-java PROPERTIES
- LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
- if(PEXPORTS_PATH)
- add_custom_command(TARGET surf-java POST_BUILD
- COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/surf-java.dll > ${CMAKE_BINARY_DIR}/lib/surf-java.def)
- endif(PEXPORTS_PATH)
-endif()