Commit Graph

26 Commits

Author SHA1 Message Date
Laurent Rineau c02bd3cbd5 Reintroduce a search in NO_MODULE mode 2023-06-01 10:15:58 +02:00
Laurent Rineau 44a7b6a431 Upgrade FindTBB.cmake
Fixes https://github.com/CGAL/cgal/issues/7349
2023-05-19 18:36:24 +02:00
Jane Tournois 321e8293af
fix outdated code
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-05-28 14:55:14 +02:00
Jane Tournois 525271c25e start by looking for TBB_ROOT (env or cmake variable) and TBB_DIR (cmake variable)
and fix 2019 Update 5 version number
2021-05-28 12:20:37 +02:00
Jane Tournois 8d4f14735b workaround a bug of earlier versions of TBB
Laurent said :
"That is a bug in earlier versions of TBB. It was fixed in TBB 2019 update 5. That is a bad interaction with #5687, that made the module FindTBB.cmake from CGAL search for TBB in Config mode, first."
2021-05-27 15:06:56 +01:00
Maxime Gimeno 74b3504879 First search for TBB in config mode 2021-05-06 14:41:08 +02:00
Laurent Rineau 7e36ab1848 FindTBB.cmake: read both TBBROOT and TBB_ROOT
Fix #4240
2019-09-26 15:52:20 +02:00
Laurent Rineau a17c0d628d Fix our usage of TBB and <thread.h>
A lot of parts of CGAL use `<thread>` in conjunction with TBB. I have
added the `find_package(Threads)` in `CGAL_target_use_TBB.cmake` for
convenience.

I have also restored FindTBB.cmake as a pure copy of
  https://github.com/Kitware/VTK/blob/master/CMake/FindTBB.cmake
with that version:

> c7249fed2e73ce25fbbc53363d9caf4ab5cc9195
> Author: Cory Quammen <cory.quammen@kitware.com>
> Date:   Thu Feb 14 23:21:09 2019 -0500
>
>     FindTBB: handle basic linker scripts
>
>     TBB binaries may define libtbb.so as a linker script of the form
>
>     INPUT(libtbb.so.2)
>
>     Make FindTBB find the real .so file libtbb.so points to in such cases.
>
>     Approach borrowed from vtk-m/CMake/VTKmDeviceAdapters.cmake on
>     suggestion from Robert Maynard.
>
>
2019-07-24 10:35:36 +02:00
Maxime Gimeno 82567685ad Add include of CGAL_taret_use_TBB in the end of the new FindTBB 2019-07-19 09:34:12 +02:00
Maxime Gimeno 7f604308d0 Update FindTBB.cmake 2019-07-15 12:45:28 +02:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Clément Jamin c1fe6fb342 Add TBB support for MSVC14
TBB now supports MSVC 2015 (= VC14)

https://software.intel.com/en-us/articles/whats-new-intel-threading-building-blocks-44-update-1
2016-06-15 11:03:58 +02:00
Maxime Gimeno fc992ed0c3 Replace the string(REPLACE vc...) by a single string(REGEX REPLACE ...). 2016-06-01 09:59:27 +02:00
Jane Tournois 24666eb13e deal with msvc12 and msvc14
until now, msvc14 is not supported by tbb (<= 4.4)
this commit prevents the testsuite from looking for it
2015-09-08 10:21:55 +02:00
Laurent Rineau fd2026a044 Find TBB first with NO_DEFAULT_PATH
With default CMake paths, the TBB installed in /usr/{include/,lib64/} is
found, whatever there is in TBB environment variables. If the search
with NO_DEFAULT_PATH does not find TBB, then the search is made again
with default paths.
2015-01-15 14:39:31 +01:00
Laurent Rineau 0f5fc963b4 Support QUIETLY in FindTBB.cmake 2014-07-09 15:36:25 +02:00
Laurent Rineau a25bc04512 On Fedora, users of TBB may need pthread 2014-07-03 18:45:36 +02:00
Laurent Rineau e724c1f519 Fix end-of-lines and end-of-files 2013-07-04 11:51:23 +02:00
Clement Jamin 4d0c6a6bb0 Better FindTBB.cmake which works even if the debug version is not found
If the debug versions are not found, the release versions will be used instead
for the debug mode.
If the tbb_malloc library is not found, doesn't link with it.
2013-07-03 16:48:10 +02:00
Clement Jamin 9c57c17a34 Bugfix for TBB_LIBRARY_DIRS 2013-07-03 12:28:50 +02:00
Clement Jamin 3dfb28141f Mark TBB_MALLOCPROXY_XXX_LIBRARY as advanced in CMake 2013-06-28 17:55:12 +02:00
Clement Jamin da77b4d879 Correct FindTBB.cmake + add a UseTBB.cmake 2013-06-27 16:50:55 +02:00
Clement Jamin 90d0125741 Improved FindTBB.cmake
- Untabified
- Does not link with the TBB mallow proxy anymore, but set
  TBB_MALLOCPROXY_DEBUG_LIBRARY and TBB_MALLOCPROXY_RELEASE_LIBRARY
  so that a user can still link with it if necessary
  Note: the malloc proxy is not available on MacOS.
- Calls include_directories ( ${TBB_INCLUDE_DIRS} ) and
  link_directories( ${TBB_LIBRARY_DIRS} ) to set paths
2013-06-27 15:54:39 +02:00
Clement Jamin 0a89951884 Updated FindTBB.cmake so that it uses the "optimized"/"debug" cmake keywords 2013-01-23 15:14:08 +01:00
Clement Jamin 0fcd19db7a Updated FindTBB so that it looks for the malloc proxy + better error messages 2013-01-22 14:50:01 +01:00
Clement Jamin 5f7d4bd88d Original FindTBB.cmake file 2013-01-22 14:42:13 +01:00