From: Arnaud Giersch Date: Thu, 31 Jan 2013 13:49:06 +0000 (+0100) Subject: Build libSG_java. X-Git-Tag: v3_9_90~569^2~11 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bfdb6f5ee2869de9402478e5a6c3fb50accc22e4 Build libSG_java. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b9c2a9718e..4f1436e5c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ else() endif() set(libsimgrid_version "${release_version}") set(libsmpi_version "${release_version}") +set(libSG_java_version "${release_version}") set(GCC_NEED_VERSION "4.0") set(APPLE_NEED_GCC_VERSION "4.6") diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index bce4151bff..09cd2818e9 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -23,6 +23,30 @@ if(enable_smpi) endif() endif() +if(enable_java) + 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}") + add_dependencies(SG_java simgrid) + + if(WIN32) + get_target_property(SIMGRID_LIB_NAME_NAME SG_java LIBRARY_OUTPUT_NAME) + set_target_properties(SG_java PROPERTIES + LINK_FLAGS "-Wl,--subsystem,windows,--kill-at ${SIMGRID_LIB_NAME}" + PREFIX "") + find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS) + message(STATUS "pexports: ${PEXPORTS_PATH}") + if(PEXPORTS_PATH) + add_custom_command(TARGET SG_java POST_BUILD + COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java.dll > ${CMAKE_BINARY_DIR}/SG_java.def) + endif(PEXPORTS_PATH) + else() + target_link_libraries(SG_java simgrid) + endif() +endif() + add_dependencies(simgrid maintainer_files) # if supernovaeing, we need some depends to make sure that the source gets generated