From af3a3f76e72d581e8d0461a65ffd63d95df4fb6c Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Wed, 10 Jun 2015 01:45:47 +0200 Subject: [PATCH 1/1] Fix the Java compilation and linking --- buildtools/Cmake/MakeJava.cmake | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index c4bb53964e..58682d83a4 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -115,13 +115,14 @@ add_custom_command( ) add_custom_target(simgrid-java_jar ALL DEPENDS ${SIMGRID_JAR}_finalized) +include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) if(enable_maintainer_mode) set(CMAKE_SWIG_FLAGS "-package" "org.simgrid.surf") set(CMAKE_SWIG_OUTDIR "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf") set_source_files_properties(${JSURF_SWIG_SRC} PROPERTIES CPLUSPLUS 1) - include_directories(${JNI_INCLUDE_DIRS}) + swig_add_module(surf-java java ${JSURF_SWIG_SRC} ${JSURF_JAVA_C_SRC}) add_custom_command(TARGET surf-java POST_BUILD @@ -131,13 +132,10 @@ if(enable_maintainer_mode) swig_link_libraries(surf-java simgrid) else() - add_library(surf-java SHARED - ${JSURF_C_SRC}) + add_library(surf-java SHARED ${JSURF_C_SRC}) target_link_libraries(surf-java simgrid) - set_source_files_properties("${CMAKE_HOME_DIRECTORY}/src/bindings/java/surfJAVA_wrap.cxx" - 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) -- 2.20.1