note that we do need Boost 1.48

diff --git a/ChangeLog b/ChangeLog
index 1589b2b..735fb4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,7 @@ SimGrid (3.12) NOT RELEASED; urgency=low
    - Add two new log appenders : rollfile and splitfile. Patch by Fabien Chaix.
  Build System
   * Require g++ v4.7 at least to not speak prehistorical C++.
    - Add two new log appenders : rollfile and splitfile. Patch by Fabien Chaix.
  Build System
   * Require g++ v4.7 at least to not speak prehistorical C++.

+  * Require Boost 1.48 (for signal2 component).

   * Tracing is now always enabled (no way to turn it out)
   * Move headers around to sort them out on installed systems:
     - instr/instr.h  -> simgrid/instr.h
   * Tracing is now always enabled (no way to turn it out)
   * Move headers around to sort them out on installed systems:
     - instr/instr.h  -> simgrid/instr.h

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 1a74815..34023d1 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -111,7 +111,7 @@ if(enable_ns3)
   endif()
 endif()
 
   endif()
 endif()
 

-find_package(Boost 1.42)
+find_package(Boost 1.48)

 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
 else()
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
 else()