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

Merge remote-tracking branch 'cgal/5.3.x-branch'

This commit is contained in:
Sébastien Loriot 2021-09-10 17:51:35 +02:00
parent facabcac86 38435dc7c9
commit 8c9fc331cd
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,8 +327,10 @@ cmake variables is necessary.
\subsection installation_tbb TBB Library \subsection installation_tbb TBB Library
If \tbb is not automatically found, the user must set the `TBB_ROOT` If \tbb is not automatically found, the user must set some variables, depending on the used version of TBB.
environment variable. The environment variable `TBB_ARCH_PLATFORM=<arch>/<compiler>` must be set.
\subsubsection installation_old_tbb TBB 2020 or before
The `TBB_ROOT` and `TBB_ARCH_PLATFORM=<arch>/<compiler>` environment variables must be set.
`<arch>` is `ia32` or `intel64`. `<compiler>` describes the Linux kernel, gcc version or Visual Studio version `<arch>` is `ia32` or `intel64`. `<compiler>` describes the Linux kernel, gcc version or Visual Studio version
used. It should be set to what is used in `$TBB_ROOT/lib/<arch>`. used. It should be set to what is used in `$TBB_ROOT/lib/<arch>`.
@ -349,6 +351,14 @@ Note that the variables in the table below are being used.
| `TBB_MALLOCPROXY_DEBUG_LIBRARY` | Full pathname of the compiled TBB debug malloc_proxy library (optional) | CMake | | `TBB_MALLOCPROXY_DEBUG_LIBRARY` | Full pathname of the compiled TBB debug malloc_proxy library (optional) | CMake |
| `TBB_MALLOCPROXY_RELEASE_LIBRARY` | Full pathname of the compiled TBB release malloc_proxy library (optional) | CMake | | `TBB_MALLOCPROXY_RELEASE_LIBRARY` | Full pathname of the compiled TBB release malloc_proxy library (optional) | CMake |
\subsubsection installation_new_tbb OneTBB
Since OneAPI \tbb version 2021, Intel provides CMake scripts of their own, and the user only have to set the `TBB_DIR`
CMake variable at configuration time. A typical value for `TBB_DIR` is
`/opt/intel/oneapi/tbb/latest/lib/cmake/tbb` on Unix systems, and `C:/dev/OneAPI/tbb/latest/lib/cmake/tbb` on Windows.
Alternatively, the user can instead source the `setvars` script that can be found at `/opt/intel/oneapi/setvars.sh` on Unix and
`C:/dev/OneAPI/setvars.bat` on Windows. It will setup the PATH and all Intel internal variables to be able to easily use
any library of the OneAPI.
\subsection installation_laslib LASlib library \subsection installation_laslib LASlib library
If LASLIB is not automatically found, the following variables must be set: If LASLIB is not automatically found, the following variables must be set: