Skip to content

Fix CMake configuration and build with oneTBB #8239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oshadura merged 1 commit into from
May 27, 2021
Merged

Fix CMake configuration and build with oneTBB #8239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,8 +1240,10 @@ if(imt AND NOT builtin_tbb)
endif()
endif()

# Check that the found TBB does not use captured exceptions.
if(TBB_FOUND)
# Check that the found TBB does not use captured exceptions. If the header
# <tbb/tbb_config.h> does not exist, assume that we have oneTBB newer than
# version 2021, which does not have captured exceptions anyway.
if(TBB_FOUND AND EXISTS "${TBB_INCLUDE_DIRS}/tbb/tbb_config.h")
set(CMAKE_REQUIRED_INCLUDES "${TBB_INCLUDE_DIRS}")
check_cxx_source_compiles("
#include <tbb/tbb_config.h>
Expand Down
1 change: 0 additions & 1 deletion core/imt/src/RTaskArena.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Require TBB without captured exceptions
#define TBB_USE_CAPTURED_EXCEPTION 0
#include "tbb/tbb_config.h"

#include "ROOT/RTaskArena.hxx"
#include "ROpaqueTaskArena.hxx"
Expand Down
1 change: 0 additions & 1 deletion core/imt/src/TThreadExecutor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Require TBB without captured exceptions
#define TBB_USE_CAPTURED_EXCEPTION 0
#include "tbb/tbb_config.h"

#include "ROOT/TThreadExecutor.hxx"
#include "ROpaqueTaskArena.hxx"
Expand Down