X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a6b25ecfefe47e7bbb88999137858e8b40c73f4..12e502742be678b40d9aa89db6abff76b36e62f8:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fd26a8082..f8fdcbca02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,22 +253,31 @@ endif()
 # Usable components: https://www.boost.org/doc/libs/1_65_1/doc/html/stacktrace/configuration_and_build.html
 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")
 else()
-  find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace)
+  find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace stacktrace_addr2line)
   set(Boost_FOUND 1) # These components are optionals
   message(STATUS "Mandatory components found. SimGrid is compilable.")
   message(STATUS "Looking for optional Boost components:")
 
   if (Boost_STACKTRACE_BACKTRACE_FOUND)
-    message (STATUS "  stacktrace: found. Activating human-readable stack traces.")
-    set(HAVE_BOOST_STACKTRACE 1)
+    message (STATUS "  stacktrace: found the fast 'backtrace' implementation. Activating human-readable stack traces.")
+    set(HAVE_BOOST_STACKTRACE_BACKTRACE 1)
     set(SIMGRID_DEP "${SIMGRID_DEP} -lboost_stacktrace_backtrace")
   else()
-    message (STATUS "  stacktrace: MISSING. Install libboost-stacktrace-dev to display the stacktraces.")
-    set(HAVE_BOOST_STACKTRACE 0)
+    set(HAVE_BOOST_STACKTRACE_BACKTRACE 0)
+    
+    if (Boost_STACKTRACE_ADDR2LINE_FOUND)
+      message (STATUS "  stacktrace: found the slow 'addr2line' implementation. Activating human-readable stack traces.")
+      set(HAVE_BOOST_STACKTRACE_ADDR2LINE 1)
+      set(SIMGRID_DEP "${SIMGRID_DEP} -lboost_stacktrace_addr2line")
+    else()
+      message (STATUS "  stacktrace: MISSING. Install libboost-stacktrace-dev to display the stacktraces.")
+      set(HAVE_BOOST_STACKTRACE_ADDR2LINE 0)
+    endif()
   endif()
 
   if(Boost_CONTEXT_FOUND)
@@ -358,6 +367,9 @@ endif()
 
 if (minimal_java)
   message(STATUS "Don't look for libunwind as we build a minimal jar file.")
+  if(enable_model-checking)
+    message(FATAL_ERROR "You cannot enable model-checking and minimal_java at the same time.")
+  endif()
 else()
   include(FindLibunwind)
   if(HAVE_LIBUNWIND)
@@ -393,7 +405,7 @@ endif()
 
 if(enable_smpi)
   SET(HAVE_SMPI 1)
-  if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux")
+  if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux|SunOS")
     SET(HAVE_PRIVATIZATION 1)
   else()
     message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")
@@ -795,7 +807,10 @@ endif()
 if(enable_python)
   if(pybind11_FOUND)
     message(STATUS "Found pybind11, with C++14.")
-    pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp)
+    if(NOT enable_lto)
+      set(pybind11_options NO_EXTRAS)
+    endif()
+    pybind11_add_module(python-bindings src/bindings/python/simgrid_python.cpp ${pybind11_options})
     target_compile_features(python-bindings PRIVATE cxx_std_14)
     target_link_libraries(python-bindings PUBLIC simgrid)
     set_target_properties(python-bindings PROPERTIES