From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 16 May 2019 09:08:59 +0000 (+0200)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3.22.4~126^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e2767b564d5b6f3da982646b3cc7537fa05aa34d?hp=-c

Merge branch 'master' of framagit.org:simgrid/simgrid
---

e2767b564d5b6f3da982646b3cc7537fa05aa34d
diff --combined CMakeLists.txt
index 868e384c19,edbe5aaa57..f8fdcbca02
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -253,31 -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)
@@@ -807,7 -798,10 +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
diff --combined ChangeLog
index 7dd1b9a45b,a84b49e968..1f670a58d4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -2,7 -2,7 +2,8 @@@ SimGrid (3.23) NOT RELEASED (Release Ta
  
  General:
   - Stop setting random seed with srand48() at initialization.
 + - Use addr2line as a fallback for stacktraces when backtrace is not available.
+  - Build option -Denable_documentation is now OFF by default.
  
  XBT:
   - New log appenders: stdout and stderr. Use stdout for xbt_help.
@@@ -17,8 -17,10 +18,10 @@@ Model-checker
   - Remove option 'model-check/record': Paths are recorded in any cases now.
  
  Fixed bugs (GH=GitHub; FG=FramaGit):
+  - FG#7: simple cmake call requires doxygen
   - FG#10: Can not use MSG_process_set_data from SMPI any more
   - FG#11: Auto-restart actors forget their on_exit behavior
+  - FG#12: -Denable_lto=OFF doesn't disable LTO
   - GH#133: Java : a process can run on a VM even if its host is off
   - GH#326: Valgrind-detected error for join() when energy plugin is activated