Rename cmake option 'minimal_java' into 'minimal-bindings'

I will use it for python too.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b81339..5d4c563 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ release:
   script:
   - apt update && apt install -y binutils-x86-64-linux-gnu wget unzip zip
   # Build the linux version of the jarfile without the boost dependency
-  - cmake -Denable_documentation=OFF -Denable_java=ON -Denable_lib_in_jar=ON -Dminimal_java=ON -Denable_compile_optimizations=ON -Denable_smpi=OFF .
+  - cmake -Denable_documentation=OFF -Denable_java=ON -Denable_lib_in_jar=ON -Dminimal-bindings=ON -Denable_compile_optimizations=ON -Denable_smpi=OFF .
   - make VERBOSE=1 dist simgrid simgrid-java_jar
   # Get the foreign architectures
   - wget https://ci.appveyor.com/api/projects/mquinson/simgrid/artifacts/simgrid.jar -O simgrid-windows.jar

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50075e0..044b05b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,11 +214,14 @@ include(CheckLibraryExists)
 include(CheckSymbolExists)
 
 set(HAVE_GRAPHVIZ 0)
-include(FindGraphviz)
-
 set(SIMGRID_HAVE_LUA 0)
-if(enable_lua)
-  include(FindLuaSimgrid)
+if(minimal-bindings)
+  message(STATUS "Don't even look for graphviz nor lua, as we build minimal binding libraries.")
+else()
+  include(FindGraphviz)
+  if(enable_lua)
+    include(FindLuaSimgrid)
+  endif()
 endif()
 
 set(SIMGRID_HAVE_NS3 0)
@@ -264,8 +267,8 @@ set(_Boost_STACKTRACE_HEADERS           "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
 set(_Boost_STACKTRACE_ADDR2LINE_HEADERS "boost/stacktrace.hpp")
 
-if(minimal_java) # When we want a minimal jarfile, don't even search for boost optional components
-  message(STATUS "Don't even look for boost optional components, as we build a minimal jar file")
+if(minimal-bindings) # When we want a minimal jarfile, don't even search for boost optional components
+  message(STATUS "Don't even look for boost optional components, as we build minimal binding libraries.")
 else()
   find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace stacktrace_addr2line)
   set(Boost_FOUND 1) # These components are optionals
@@ -374,10 +377,10 @@ else()
   SET(SIMGRID_HAVE_MALLOCATOR 0)
 endif()
 
-if (minimal_java)
-  message(STATUS "Don't look for libunwind as we build a minimal jar file.")
+if (minimal-bindings)
+  message(STATUS "Don't look for libunwind as we build minimal binding libraries.")
   if(enable_model-checking)
-    message(FATAL_ERROR "You cannot enable model-checking and minimal_java at the same time.")
+    message(FATAL_ERROR "You cannot enable model-checking and minimal-bindings at the same time.")
   endif()
 else()
   include(FindLibunwind)

diff --git a/docs/source/Installing_SimGrid.rst b/docs/source/Installing_SimGrid.rst
index 02c1b87..8a5218a 100644 (file)
--- a/docs/source/Installing_SimGrid.rst
+++ b/docs/source/Installing_SimGrid.rst
@@ -258,8 +258,9 @@ enable_smpi_ISP_testsuite (on/OFF)
 enable_smpi_MPICH3_testsuite (on/OFF)
   Adds many extra tests for the MPI module.
 
-minimal_java (on/OFF)
-  Build a java library with as few dependencies as possible.
+minimal-bindings (on/OFF)
+  Take as few optional dependencies as possible, to get minimal
+  library bindings in Java and Python.
 
 Reset the build configuration
 """""""""""""""""""""""""""""

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index 167d5fe..08bd1e9 100644 (file)
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -27,10 +27,9 @@ option(enable_documentation "Whether to produce documentation" off)
 option(enable_ns3            "Whether ns3 model is activated." off)
 option(enable_java           "Whether the Java bindings are activated." off)
 option(enable_lib_in_jar     "Whether the native libraries are bundled in a Java jar file" on)
-option(minimal_java          "Whether to compile the jarfile with the minimal dependency set" off)
-mark_as_advanced(minimal_java)
-if(minimal_java)
-  set(enable_java on)
+option(minimal-bindings      "Whether to compile the bindings libraries (Java/Python) with the minimal dependency set" off)
+mark_as_advanced(minimal-bindings)
+if(minimal-bindings)
   set(enable_lib_in_jar on)
 endif()