songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wrong conflict resolution in d89690ae97

This commit is contained in:
Sébastien Loriot 2021-09-06 16:07:55 +02:00
parent fcb9cdb929
commit b71440650c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/doc/Documentation/advanced/Configuration_variables.txt
View File

@ -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=<path>`,
then you should set `Boost_DIR=<path>/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