add_library(SG_java SHARED ${JMSG_C_SRC})
set_target_properties(SG_java PROPERTIES VERSION ${libSG_java_version})
get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES)
-set_target_properties(SG_java PROPERTIES
- INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+if (COMMON_INCLUDES)
+ set_target_properties(SG_java PROPERTIES
+ INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+else()
+ set_target_properties(SG_java PROPERTIES
+ INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
+endif()
add_dependencies(SG_java simgrid)
+get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES)
+message("-- [Java] SG_java includes: ${CHECK_INCLUDES}")
+
if(WIN32)
get_target_property(SIMGRID_LIB_NAME_NAME SG_java LIBRARY_OUTPUT_NAME)
set_target_properties(SG_java PROPERTIES
##
if(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
if(${ARCH_32_BITS})
- set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/x86/")
+ set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/i386/")
else()
set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/amd64/")
endif()
message(WARNING "Unknown system type. Processor: ${CMAKE_SYSTEM_PROCESSOR}; System: ${CMAKE_SYSTEM_NAME}")
set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR/")
endif()
-message("Native libraries bundled into: ${JSG_BUNDLE}")
+message("-- [Java] Native libraries bundled into: ${JSG_BUNDLE}")
## Don't strip libraries if not in release mode
##
${CMAKE_HOME_DIRECTORY}/COPYING
${CMAKE_HOME_DIRECTORY}/ChangeLog
${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
+ ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
COMMAND ${CMAKE_COMMAND} -E remove_directory "NATIVE"
COMMAND ${CMAKE_COMMAND} -E make_directory "${JSG_BUNDLE}"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}" "${JSG_BUNDLE}"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/COPYING" "${JSG_BUNDLE}"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog" "${JSG_BUNDLE}"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java" "${JSG_BUNDLE}"
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1" "${JSG_BUNDLE}"
COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} "NATIVE"
COMMAND ${CMAKE_COMMAND} -E remove ${SIMGRID_JAR}_finalized
COMMAND ${CMAKE_COMMAND} -E touch ${SIMGRID_JAR}_finalized