include(UseJava)
find_package(JNI REQUIRED)
-message("-- [Java] JNI found: ${JNI_FOUND}")
-message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
+message(STATUS "[Java] JNI found: ${JNI_FOUND}")
+message(STATUS "[Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
if(WIN32)
execute_process(COMMAND java -d64 -version
endif()
endif()
-# find_package(SWIG)
-# if(${SWIG_FOUND})
-# include(UseSWIG)
-# message("-- [Java] Swig found: version ${SWIG_VERSION}")
-# else()
-# message("-- [Java] Swig NOT FOUND. That's fine unless you work on this part yourself.")
-# endif()
-#mark_as_advanced(SWIG_EXECUTABLE)
-
# Rules to build libsimgrid-java
################################
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)
+add_dependencies(tests simgrid-java)
get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
if (COMMON_INCLUDES)
endif()
get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
-message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}")
+message(STATUS "[Java] simgrid-java includes: ${CHECK_INCLUDES}")
# Rules to build simgrid.jar
############################
add_jar(simgrid-java_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid)
endif()
-add_dependencies(simgrid-java_jar simgrid-java)
-add_dependencies(simgrid-java_jar simgrid)
+if(enable_lib_in_jar)
+ add_dependencies(simgrid-java_jar simgrid-java)
+ add_dependencies(simgrid-java_jar simgrid)
+endif()
if (enable_documentation)
add_custom_command(
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()
set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
- set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/x86)
- endif()
- if( (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
- (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
- set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
+ if( (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$") OR
+ (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
+ (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
+ if(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits
+ set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/x86)
+ else()
+ set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
+ endif()
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI)
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}
)
DEPENDS simgrid simgrid-java ${JAVALIBS}
# There is no way to disable the dependency of mingw-64 on that lib, unfortunately nor to script cmake -E properly
- # So let's be brutal and copy it in any case (even on non-windows builds) from the location where chocolatey installs it.
+ # 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:/tools/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true
+ 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:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin/libwinpthread-1.dll ${JAVA_NATIVE_PATH}/libwinpthread-1.dll || true
)
endif()
#
# This has to be done with the classical Apple tools, as follows:
- COMMAND install_name_tool -change ${CMAKE_BINARY_DIR}/lib/libsimgrid.${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX} @loader_path/libsimgrid.dylib ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO}
+ COMMAND install_name_tool -change ${CMAKE_BINARY_DIR}/lib/libsimgrid.${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX} @loader_path/libsimgrid.dylib ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO}
)
-endif()
+endif(APPLE)
add_custom_command(
TARGET simgrid-java_jar POST_BUILD
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})