X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3efaa934ae2069bafb44ad934b8830304114a327..38906765bf812b1c32df889f3ce7e72bb58e1326:/tools/cmake/Java.cmake diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index e8fa5e22b6..eb20402562 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -42,11 +42,9 @@ target_link_libraries(simgrid-java simgrid) get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES) if (COMMON_INCLUDES) - set_target_properties(simgrid-java PROPERTIES - INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}") + set_target_properties(simgrid-java PROPERTIES INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}") else() - set_target_properties(simgrid-java PROPERTIES - INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}") + set_target_properties(simgrid-java PROPERTIES INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}") endif() get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES) @@ -61,10 +59,8 @@ set(SIMGRID_JAR "${CMAKE_BINARY_DIR}/simgrid.jar") set(MANIFEST_IN_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.in") set(MANIFEST_FILE "${CMAKE_BINARY_DIR}/src/bindings/java/MANIFEST.MF") -set(LIBSIMGRID_SO - libsimgrid${CMAKE_SHARED_LIBRARY_SUFFIX}) -set(LIBSIMGRID_JAVA_SO - ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED_LIBRARY_SUFFIX}) +set(LIBSIMGRID_SO libsimgrid${CMAKE_SHARED_LIBRARY_SUFFIX}) +set(LIBSIMGRID_JAVA_SO ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED_LIBRARY_SUFFIX}) ## Here is how to build simgrid.jar ## @@ -104,8 +100,6 @@ endif() ### if(enable_lib_in_jar) - - set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")