X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/746d9f705cc69e46256eb4e2d5f8006ab0dbd4d5..5e697c041ca62e634c8fa224cf4164ff4cb6ac82:/tools/cmake/MakeJava.cmake diff --git a/tools/cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake index 10acb49fe7..8939774e98 100644 --- a/tools/cmake/MakeJava.cmake +++ b/tools/cmake/MakeJava.cmake @@ -81,7 +81,7 @@ else() add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid) endif() -set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/tools/cmake/Scripts/java_bundle.sh") +set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/java_bundle.sh") set(JAVA_BUNDLE_SO_FILES ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} @@ -144,8 +144,7 @@ add_dependencies(simgrid-java_pre_jar surf-java) if(WIN32) set_target_properties(surf-java PROPERTIES - LINK_FLAGS "-Wl,--subsystem,windows,--kill-at" - PREFIX "") + 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)