Skip to content
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

Jump to bottom

TBB Re-Configuration Fix, main branch (2024.10.30.) #759

Merged
merged 1 commit into from
Oct 31, 2024
Merged

TBB Re-Configuration Fix, main branch (2024.10.30.) #759

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
28 changes: 14 additions & 14 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,20 @@ if( TRACCC_SETUP_EIGEN3 )
endif()
endif()

# Set up TBB.
option( TRACCC_SETUP_TBB
"Set up the TBB target(s) explicitly" TRUE )
option( TRACCC_USE_SYSTEM_TBB
"Pick up an existing installation of TBB from the build environment"
${TRACCC_USE_SYSTEM_LIBS} )
if( TRACCC_SETUP_TBB )
if( TRACCC_USE_SYSTEM_TBB )
find_package( TBB REQUIRED )
else()
add_subdirectory( extern/tbb )
endif()
endif()

# Set up CCCL.
option( TRACCC_SETUP_THRUST
"Set up the Thrust target(s) explicitly" TRUE )
Expand Down Expand Up @@ -189,20 +203,6 @@ if( TRACCC_SETUP_ROCTHRUST )
THRUST_IGNORE_CUB_VERSION_CHECK )
endif()

# Set up TBB.
option( TRACCC_SETUP_TBB
"Set up the TBB target(s) explicitly" TRUE )
option( TRACCC_USE_SYSTEM_TBB
"Pick up an existing installation of TBB from the build environment"
${TRACCC_USE_SYSTEM_LIBS} )
if( TRACCC_SETUP_TBB )
if( TRACCC_USE_SYSTEM_TBB )
find_package( TBB REQUIRED )
else()
add_subdirectory( extern/tbb )
endif()
endif()

# Set up DPL if SYCL is built.
option( TRACCC_SETUP_DPL
"Set up the DPL target(s) explicitly" ${TRACCC_BUILD_SYCL} )
Expand Down
8 changes: 4 additions & 4 deletions extern/tbb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# TRACCC library, part of the ACTS project (R&D line)
#
# (c) 2022 CERN for the benefit of the ACTS project
# (c) 2022-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.14 )
cmake_minimum_required( VERSION 3.24 )
krasznaa marked this conversation as resolved.
Show resolved Hide resolved
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
Expand All @@ -18,10 +18,10 @@ message( STATUS "Building TBB as part of the TRACCC project" )

# Declare where to get TBB from.
set( TRACCC_TBB_SOURCE
"URL;https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.7.0.tar.gz;URL_MD5;68e617448f71df02d8688c84d53778f6"
"URL;https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.13.0.tar.gz;URL_MD5;f287cd007240a838286ff13e7deaee12"
CACHE STRING "Source for TBB, when built as part of this project" )
mark_as_advanced( TRACCC_TBB_SOURCE )
FetchContent_Declare( TBB ${TRACCC_TBB_SOURCE} )
FetchContent_Declare( TBB ${TRACCC_TBB_SOURCE} OVERRIDE_FIND_PACKAGE )

# Options used in the build of TBB.
set( TBB_TEST FALSE CACHE BOOL "Turn off the TBB tests" )
Expand Down
Loading