From: Augustin Degomme Date: Mon, 7 Apr 2014 07:54:57 +0000 (+0200) Subject: fix surf-java library win compilation X-Git-Tag: v3_11~148 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cb1fbdbe0361918879b29a9895a6445cd7c76cbd fix surf-java library win compilation --- diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index c8df82ab0d..bf86b14d1b 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -121,7 +121,20 @@ set_source_files_properties(${JSURF_SWIG_SRC} PROPERTIES CPLUSPLUS 1) #set_source_files_properties(${SURF_SWIG_FILE} PROPERTIES SWIG_FLAGS "-includeall") include_directories(${JNI_INCLUDE_DIRS}) swig_add_module(surf-java java ${JSURF_SWIG_SRC} ${JSURF_JAVA_C_SRC}) + +if(WIN32) + set_target_properties(surf-java PROPERTIES + LINK_FLAGS "-Wl,--subsystem,windows,--kill-at" + PREFIX "") + 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() + swig_link_libraries(surf-java simgrid) add_dependencies(simgrid-java surf-java) add_dependencies(simgrid-java_pre_jar surf-java) + +