Merge branch 'master' into 'master'

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 583e482..84fe7f3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ else()
 endif()
 
 if(WIN32 OR MINGW)
-  message(FATAL "SimGrid does not build on native windows, nor with MinGW. Please use WSL2 instead.")
+  message(FATAL_ERROR "SimGrid does not build on native windows, nor with MinGW. Please use WSL2 instead.")
 endif()
 
 message(STATUS "Configuring SimGrid v${release_version}")
@@ -19,7 +19,6 @@ message(STATUS "Configuring SimGrid v${release_version}")
 set(SIMGRID_VERSION_STRING "SimGrid version ${release_version}")
 
 set(libsimgrid_version "${release_version}")
-set(libsimgrid-java_version "${release_version}")
 
 # Basic checks on cmake
 cmake_minimum_required(VERSION 3.5)
@@ -244,11 +243,6 @@ else()
   message(STATUS "Disabling model BMF because Eigen3 was not found. If it's installed, use EIGEN3_HINT to hint cmake about the location of Eigen3Config.cmake")
 endif()
 
-set(SIMGRID_HAVE_MSG 0)
-if(enable_msg)
-  set(SIMGRID_HAVE_MSG 1)
-endif()
-
 set(HAVE_PAPI 0)
 if(enable_smpi_papi)
   include(FindPAPI)
@@ -264,7 +258,7 @@ 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-bindings) # When we want a minimal jarfile, don't even search for boost optional components
+  if(minimal-bindings) # When we want a minimal python library, don't even search for boost optional components
     message(STATUS "Don't even look for boost optional components, as we build minimal binding libraries.")
     find_package(Boost 1.48)
   else()
@@ -386,10 +380,6 @@ if(enable_model-checking)
   include_directories(${LIBDW_INCLUDE_DIR} ${LIBELF_INCLUDE_DIR} ${LIBEVENT_INCLUDE_DIR})
   set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}")
   set(SIMGRID_HAVE_MC 1)
-  if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_java)
-    message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling the Java bindings.")
-    set(enable_java FALSE)
-  endif()
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gdwarf-4")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gdwarf-4")
 else()
@@ -399,10 +389,6 @@ endif()
 mark_as_advanced(PATH_LIBDW_H)
 mark_as_advanced(PATH_LIBDW_LIB)
 
-if(enable_java AND NOT enable_msg)
-  message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_msg=ON or -Denable_java=OFF")
-endif()
-
 if (enable_model-checking AND enable_ns3)
   message(WARNING "Activating both model-checking and ns-3 bindings is considered experimental.")
 endif()
@@ -594,7 +580,6 @@ set(generated_files_to_clean
   ${CMAKE_BINARY_DIR}/bin/smpiff
   ${CMAKE_BINARY_DIR}/bin/smpif90
   ${CMAKE_BINARY_DIR}/bin/smpirun
-  ${CMAKE_BINARY_DIR}/bin/colorize
   ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
   ${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace
   )
@@ -762,10 +747,6 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
 ### Make Libs
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake)
 
-if(enable_java)
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Java.cmake)
-endif()
-
 # Python binding (with pybind11)
 ################
 if((NOT DEFINED enable_python) OR enable_python)
@@ -898,11 +879,6 @@ message("                version .............: ${CMAKE_C_COMPILER_VERSION}")
 message("                is gnu ..............: ${CMAKE_COMPILER_IS_GNUCC}")
 message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (id: ${CMAKE_CXX_COMPILER_ID})")
 message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")
-if(${Java_FOUND})
-  message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
-  message("                version .............: ${Java_VERSION_STRING}")
-  message("                runtime .............: ${Java_JAVA_EXECUTABLE}")
-endif()
 if(CMAKE_Fortran_COMPILER)
   message("        Compiler: Fortran ...........: ${SMPI_Fortran_COMPILER} (id: ${CMAKE_Fortran_COMPILER_ID})")
   message("                version .............: ${CMAKE_Fortran_COMPILER_VERSION}")
@@ -917,24 +893,12 @@ message("        LDFlags .....................: ${CMAKE_C_LINK_FLAGS}")
 message("        with LTO ....................: ${enable_lto}")
 message("")
 
-if (SIMGRID_HAVE_MSG)
-  message("        Compile MSG .................: ON")
-else()
-  message("        Compile MSG .................: OFF")
-endif()
-
 if (SIMGRID_HAVE_NS3)
   message("        Compile ns-3 ................: ON (path: ${NS3_PATH})")
 else()
   message("        Compile ns-3 ................: OFF  (hint: ${NS3_HINT})")
 endif()
 
-if (${Java_FOUND})
-  message("        Compile Java ................: ON")
-  message("          Native lib in jar .........: ${enable_lib_in_jar}")
-else()
-  message("        Compile Java ................: OFF")
-endif()
 if(pybind11_FOUND)
   message("        Compile Python bindings .....: ${enable_python}")
   message("          module ....................: ${PYTHON_MODULE_PREFIX}simgrid${PYTHON_MODULE_EXTENSION}")