X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a193bac5da10ecc5d35b4763f5b5a247428b01b..db027983de3b561fad52faedf8ac42f21f7912a3:/tools/cmake/Java.cmake

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index ac327078ca..df1ba3dd9c 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -3,8 +3,6 @@
 ##   This file is loaded only if the Java option is activated
 ##
 
-cmake_minimum_required(VERSION 2.8.6)
-
 find_package(Java 1.7 REQUIRED)
 include(UseJava)
 
@@ -12,23 +10,17 @@ include(UseJava)
 #
 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)
@@ -92,20 +84,26 @@ add_custom_command(
 
 if(enable_lib_in_jar)
   find_program(STRIP_COMMAND strip)
+  mark_as_advanced(STRIP_COMMAND)
   if(NOT STRIP_COMMAND)
     set(STRIP_COMMAND "cmake -E echo (strip not found)")
   endif()
-  if(WIN32)
-    set(STRIP_COMMAND "cmake -E echo (dont strip on windows)")
+  set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+  
+  if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
+    set(SG_SYSTEM_NAME GNU/kFreeBSD)
   endif()
 
-  set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
+  set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
-    set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/x86)
+    set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/x86)
   endif()
   if(  (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
        (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")     )
-    set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/amd64)
+    set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
+  endif()
+  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
+    set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI)
   endif()
 
   add_custom_command(