Add Cmake option "enable_java", and search for required dependencies.

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index abcd9c9..b1a391a 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -82,6 +82,11 @@ if(enable_smpi)
   include(FindF2c)
   SET(HAVE_SMPI 1)
 endif()
+if(enable_java)
+  find_package(Java REQUIRED COMPONENTS Runtime Development)
+  find_package(JNI REQUIRED)
+  set(HAVE_Java 1)
+endif()
 if(enable_lua)
   include(FindLua51Simgrid)
 endif()

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index a3321a0..af31674 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -20,7 +20,8 @@ option(enable_debug "Set NDEBUG flag" on)
 
 option(enable_gtnets "Whether gtnets model is activated." off)
 option(enable_ns3    "Whether ns3 model is activated." off)
-option(enable_lua "Whether the lua bindings are activated." off)
+option(enable_java   "Whether the Java bindings are activated." off)
+option(enable_lua    "Whether the lua bindings are activated." off)
 option(enable_compile_warnings "Whether compilation warnings should be turned into errors." off)
 option(enable_maintainer_mode "Whether flex and flexml files should be rebuilt." off)
 option(enable_tracing "Tracing simulations for visualization." on)

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index 1f8e842..de6683b 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -86,6 +86,10 @@ if(CMAKE_CXX_COMPILER)
   message("        Compiler: C++ .......: ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})")
   message("                version .....: ${COMPILER_CXX_VERSION}")
 endif()
+if(CMAKE_Java_COMPILER)
+  message("        Compiler: Java ......: ${CMAKE_Java_COMPILER} (${CMAKE_Java_COMPILER_ID})")
+  message("                version .....: ${COMPILER_Java_VERSION}")
+endif()
 if(CMAKE_Fortran_COMPILER)
   message("        Compiler: Fortran ...: ${CMAKE_Fortran_COMPILER} (${CMAKE_Fortran_COMPILER_ID})")
   message("                version .....: ${COMPILER_Fortran_VERSION}")
@@ -102,6 +106,7 @@ if(NOT APPLE AND NOT WIN32)
   message("        Gtnets path .........: ${gtnets_path}")
   message("        NS-3 path ...........: ${ns3_path}")
 endif()
+message("        Compile Java ........: ${HAVE_Java}")
 message("        Compile Lua .........: ${HAVE_LUA}")
 message("        Compile Smpi ........: ${HAVE_SMPI}")
 message("        Compile Smpi f77 ....: ${SMPI_F2C}")

diff --git a/simgrid-java/FindJavaSG.cmake b/simgrid-java/FindJavaSG.cmake
deleted file mode 100644 (file)
index 47bddfd..0000000
--- a/simgrid-java/FindJavaSG.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-set(JAVA_INCLUDE_PATH "$ENV{JAVA_INCLUDE_PATH}")
-set(JAVA_INCLUDE_PATH2 "$ENV{JAVA_INCLUDE_PATH}")
-
-include(FindJava)
-include(FindJNI)
-
-message(STATUS "Looking for jni.h")
-if(JAVA_INCLUDE_PATH)
- message(STATUS "Looking for jni.h - found")
-else(JAVA_INCLUDE_PATH)
- message(STATUS "Looking for jni.h - not found")
-endif(JAVA_INCLUDE_PATH)
-if(JAVA_INCLUDE_PATH)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
-       message(STATUS "Add flags -I${JAVA_INCLUDE_PATH}")
-else(JAVA_INCLUDE_PATH)
-       message(STATUS "Need to set JAVA_INCLUDE_PATH to jni.h")
-endif(JAVA_INCLUDE_PATH)
-
-message(STATUS "Looking for jni_md.h")
-if(JAVA_INCLUDE_PATH2)
-message(STATUS "Looking for jni_md.h - found")
-else(JAVA_INCLUDE_PATH2)
-message(STATUS "Looking for jni_md.h - not found")
-endif(JAVA_INCLUDE_PATH2)
-if(JAVA_INCLUDE_PATH2)
-if(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH2} ")
-       message(STATUS "Add flags -I${JAVA_INCLUDE_PATH2}")
-endif(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-endif(JAVA_INCLUDE_PATH2)
-
-if(JAVA_COMPILE)
-message(STATUS "Found javac: ${JAVA_COMPILE}")
-else(JAVA_COMPILE)
-message(FATAL_ERROR "Not found javac bin")
-endif(JAVA_COMPILE)
-
-if(JAVA_ARCHIVE)
-message(STATUS "Found jar: ${JAVA_ARCHIVE}")
-else(JAVA_ARCHIVE)
-message(FATAL_ERROR "Not found jar bin")
-endif(JAVA_ARCHIVE)
\ No newline at end of file