X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8610aab5fbff41d534f57c4848283f3f67f54049..22c94691ba84e2e0d457373dde1d68fb75459be7:/buildtools/Cmake/MakeJava.cmake diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index a0be698e1e..8a34726ab2 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -78,9 +78,9 @@ endif() ## if(CMAKE_VERSION VERSION_LESS "2.8.12") set(CMAKE_JAVA_TARGET_OUTPUT_NAME simgrid) - add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC}) + add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC}) else() - add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} ${JSURF_JAVA_GENERATED_SRC} OUTPUT_NAME simgrid) + add_jar(simgrid-java_pre_jar ${JMSG_JAVA_SRC} OUTPUT_NAME simgrid) endif() set(JAVA_BUNDLE "${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/java_bundle.sh") @@ -138,6 +138,8 @@ else() PROPERTIES COMPILE_FLAGS "-fPIC -I\"${JAVA_INCLUDE_PATH}\" -I\"${JAVA_INCLUDE_PATH2}\"" ) endif() +set_target_properties(surf-java PROPERTIES SKIP_BUILD_RPATH ON) +set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON) add_dependencies(simgrid-java surf-java) add_dependencies(simgrid-java_pre_jar surf-java)