From eca38ad8e4b4c5e5a4b1eec7c6a076033df9be93 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 19 Aug 2014 11:18:16 -0500 Subject: [PATCH] Require BOOST 1.48 or later when looking for an external installation. --- cmake/modules/FindBOOST.cmake | 4 ++-- doc/news/changes.h | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake index 33208996f5..b8b1abba40 100644 --- a/cmake/modules/FindBOOST.cmake +++ b/cmake/modules/FindBOOST.cmake @@ -43,7 +43,7 @@ IF(NOT BUILD_SHARED_LIBS) ENDIF() LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) -FIND_PACKAGE(Boost 1.44 COMPONENTS iostreams serialization system thread) +FIND_PACKAGE(Boost 1.48 COMPONENTS iostreams serialization system thread) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) # @@ -51,7 +51,7 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) # IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS) SET(Boost_USE_STATIC_LIBS FALSE) - FIND_PACKAGE(Boost 1.44 COMPONENTS iostreams serialization system thread) + FIND_PACKAGE(Boost 1.48 COMPONENTS iostreams serialization system thread) ENDIF() IF(Boost_FOUND) diff --git a/doc/news/changes.h b/doc/news/changes.h index d50891f620..2e6d6f72b8 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -97,6 +97,15 @@ inconvenience this causes.
    +
  1. Fixed: Newer versions of GCC (e.g. 4.9.x) are no longer compatible + with BOOST 1.46. Consequently, the CMake scripts now require at least + BOOST 1.48 in order to use a BOOST version found on the system. If no + installed BOOST library is found, or if the version is older than 1.48, + CMake will simply take the one that comes bundled with deal.II +
    + (Wolfgang Bangerth, 2014/08/19) +
    2. +
  2. New: There is now a documentation module that describes deal.II's support for and interaction with the @ref CPP11 "C++11 standard". -- 2.39.5