X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da2926d0733ff0683f31aeea176ce71e127264f..82c8c18086305a434d8965730f7a1ea93ddf141d:/tools/cmake/Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index f480b95050..8e0ee2ffd2 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -3,32 +3,42 @@
 ##   This file is loaded only if the Java option is activated
 ##
 
-cmake_minimum_required(VERSION 2.8.6)
-
-find_package(Java 1.7 REQUIRED)
+find_package(Java 1.7 COMPONENTS Runtime Development)
+if (NOT ${Java_FOUND})
+  message(FATAL_ERROR "Java not found (need at least Java7). Please install the JDK or disable that option")
+endif()
+set(Java_FOUND 1)
 include(UseJava)
 
+find_package(JNI REQUIRED)
+message("-- [Java] JNI found: ${JNI_FOUND}")
+message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
+
+find_package(SWIG)
+if(${SWIG_FOUND})
+  include(UseSWIG)
+  message("-- [Java] Swig found: version ${SWIG_VERSION}")
+else()
+  message("-- [Java] Swig NOT FOUND. Surf java bindings won't get refreshed. That's fine unless you work on this part yourself.")
+endif()
+mark_as_advanced(SWIG_EXECUTABLE)
+
+
 # Rules to build libsimgrid-java
 #
 add_library(simgrid-java SHARED ${JMSG_C_SRC})
 set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version})
-if (CMAKE_VERSION VERSION_LESS "2.8.8")
-  include_directories(${JNI_INCLUDE_DIRS})
 
-  message("[Java] Try to workaround missing feature in older CMake. You should better update CMake to version 2.8.8 or above.")
-  get_directory_property(CHECK_INCLUDES INCLUDE_DIRECTORIES)
+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}")
 else()
-  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}")
-  else()
-    set_target_properties(simgrid-java PROPERTIES
-      INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
-  endif()
-
-  get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
+  set_target_properties(simgrid-java PROPERTIES
+    INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
 endif()
+
+get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
 message("-- [Java] simgrid-java includes: ${CHECK_INCLUDES}")
 
 target_link_libraries(simgrid-java simgrid)
@@ -91,10 +101,6 @@ add_custom_command(
 ###
 
 if(enable_lib_in_jar)
-  find_program(STRIP_COMMAND strip)
-  if(NOT STRIP_COMMAND)
-    set(STRIP_COMMAND "cmake -E echo (strip not found)")
-  endif()
   set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
   
   if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
@@ -126,12 +132,6 @@ if(enable_lib_in_jar)
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}      ${JAVA_NATIVE_PATH}
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH}
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO}    ${JAVA_NATIVE_PATH}
-    
-    # strip seems to fail on Mac on binaries that are already stripped.
-    # It then spits: "symbols referenced by indirect symbol table entries that can't be stripped"
-    COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO}      || true
-    COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} || true
-    COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO}    || true
 
     COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR}  NATIVE
     COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE
@@ -161,7 +161,7 @@ endif(enable_lib_in_jar)
 
 include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
 
-if(enable_maintainer_mode)
+if(${SWIG_FOUND})
   set(CMAKE_SWIG_FLAGS "-package" "org.simgrid.surf")
   set(CMAKE_SWIG_OUTDIR "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf")