X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16d02f0b6e7a4d6823172138b6dce141dab14654..c12f31e0bf110c61b506ef20c1d4de6b2cd2db87:/buildtools/Cmake/MakeJava.cmake

diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
index 929a66b396..f9037de250 100644
--- a/buildtools/Cmake/MakeJava.cmake
+++ b/buildtools/Cmake/MakeJava.cmake
@@ -1,12 +1,24 @@
+cmake_minimum_required(VERSION 2.8.6)
+
+include(UseJava)
+
 # Rules to build libSG_java
 #
 add_library(SG_java SHARED ${JMSG_C_SRC})
 set_target_properties(SG_java PROPERTIES VERSION ${libSG_java_version})
 get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES)
-set_target_properties(SG_java PROPERTIES
-  INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+if (COMMON_INCLUDES)
+  set_target_properties(SG_java PROPERTIES
+    INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+else()
+  set_target_properties(SG_java PROPERTIES
+    INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
+endif()
 add_dependencies(SG_java simgrid)
 
+get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES)
+message("-- [Java] SG_java includes: ${CHECK_INCLUDES}")
+
 if(WIN32)
   get_target_property(SIMGRID_LIB_NAME_NAME SG_java LIBRARY_OUTPUT_NAME)
   set_target_properties(SG_java PROPERTIES
@@ -38,7 +50,7 @@ set(LIBSG_JAVA_SO
 ##
 if(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
   if(${ARCH_32_BITS})
-    set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/x86/")
+    set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/i386/")
   else()
     set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/amd64/")
   endif()
@@ -46,7 +58,7 @@ else()
   message(WARNING "Unknown system type. Processor: ${CMAKE_SYSTEM_PROCESSOR}; System: ${CMAKE_SYSTEM_NAME}")
   set(JSG_BUNDLE "NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR/")
 endif()
-message("Native libraries bundled into: ${JSG_BUNDLE}")
+message("-- [Java] Native libraries bundled into: ${JSG_BUNDLE}")
 
 ## Don't strip libraries if not in release mode
 ##