diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-10-31 11:49:18 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-10-31 11:49:18 +0000 |
commit | 65d609bbf5d688552ad0f5535b6c42abffe27a1f (patch) | |
tree | 3c5768bf73fb49efb57bf4c1c7ac9201a8923c8a | |
parent | 025f24d720dfdfbe4e5dafb594e811bbf5ead2f7 (diff) | |
parent | e8401b6fd2f9ff533824a6773f592b448d0863ed (diff) |
Merge of branch boost_1.56_vincent to make project depend on boost 1.56 instead of 1.48
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3968 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 5644f2ac799cb4b5409bb717efe8d1781b9467e0
-rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 2 | ||||
-rw-r--r-- | src/common/doc/installation.h | 2 | ||||
-rw-r--r-- | src/cython/doc/installation.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index b020ebfc..cde3725c 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -1,6 +1,6 @@ # This files manage third party libraries required by GUDHI -find_package(Boost 1.48.0 REQUIRED COMPONENTS system filesystem unit_test_framework program_options thread) +find_package(Boost 1.56.0 REQUIRED COMPONENTS system filesystem unit_test_framework program_options thread) if(NOT Boost_FOUND) message(FATAL_ERROR "NOTICE: This program requires Boost and will not be compiled.") diff --git a/src/common/doc/installation.h b/src/common/doc/installation.h index df7eed37..bf2d0a87 100644 --- a/src/common/doc/installation.h +++ b/src/common/doc/installation.h @@ -5,7 +5,7 @@ * Examples of GUDHI headers inclusion can be found in \ref utilities. * * \section compiling Compiling - * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> ≥ 1.48.0 + * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> ≥ 1.56.0 * and <a target="_blank" href="https://www.cmake.org/">CMake</a> ≥ 3.1. * It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2015. * diff --git a/src/cython/doc/installation.rst b/src/cython/doc/installation.rst index ef2f7af2..040f6b4a 100644 --- a/src/cython/doc/installation.rst +++ b/src/cython/doc/installation.rst @@ -7,7 +7,7 @@ Installation Compiling ********* -The library uses c++11 and requires `Boost <https://www.boost.org/>`_ ≥ 1.48.0 +The library uses c++11 and requires `Boost <https://www.boost.org/>`_ ≥ 1.56.0 and `CMake <https://www.cmake.org/>`_ ≥ 3.1. It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2015. |