From b71440650c61ec5a6a7d49b42d0949262b4ffbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 6 Sep 2021 16:07:55 +0200 Subject: [PATCH] fix wrong conflict resolution in d89690ae97275a609f2b1481f3ee90ae75f59bdd --- .../Documentation/advanced/Configuration_variables.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/doc/Documentation/advanced/Configuration_variables.txt b/Documentation/doc/Documentation/advanced/Configuration_variables.txt index cf7911b21e4..249b6cbe0b9 100644 --- a/Documentation/doc/Documentation/advanced/Configuration_variables.txt +++ b/Documentation/doc/Documentation/advanced/Configuration_variables.txt @@ -103,6 +103,16 @@ other but never both. \subsection installation_boost Boost Libraries +\subsubsection inst_boost_1_70_plus Version 1.70 and Later +Starting from \boost 1.70, the cmake config mode can be used for configuring the \boost version +to use by setting the environment variable `Boost_DIR` to the path containing the file +`BoostConfig.cmake`. For example if you manually installed \boost 1.77 with `--prefix=`, +then you should set `Boost_DIR=/lib/cmake/Boost-1.77.0`. + +\subsubsection inst_boost_up_2_1_69 Version 1.69 and Earlier + +\warning If you have a version of Boost greater than 1.69 already installed on your system, and you want to configure and compile with an earlier version of Boost, then you will need to set the CMake variable `Boost_NO_BOOST_CMAKE` to `ON` (otherwise the `FindBoost.cmake` module of CMake will start searching for `BoostConfig.cmake`, and ignore the `BOOST_ROOT` variable). + In most cases, if \boost is not automatically found, setting the `BOOST_ROOT` variable is enough. If it is not, you can specify the header and library directories individually. You can also provide the full pathname to a specific compiled library