Skip to content

Commit

Permalink
build: wrap oneTBB
Browse files Browse the repository at this point in the history
  • Loading branch information
c-dilks committed Jul 26, 2024
1 parent ea8fb56 commit 1212b12
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
4 changes: 3 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ fs = import('fs')

# subprojects
threadpool_proj = subproject('bshoshany-thread-pool')
onetbb_proj = subproject('onetbb')

# resolve dependencies
# NOTE: those that are typically installed by package managers should use `meson/minimum-version.sh`
Expand All @@ -49,6 +50,7 @@ ROOT_dep = dependency(
version: run_command('meson' / 'minimum-version.sh', 'ROOT', check: true).stdout().strip(),
)
threadpool_dep = dependency('bshoshany-thread-pool') # `BS::thread_pool` https://github.com/bshoshany/thread-pool
onetbb_dep = dependency('onetbb')#, fallback: ['onetbb', 'onetbb_dep'])

# list of dependencies
# FIXME: for users which use LD_LIBRARY_PATH, we should try to keep this list
Expand Down Expand Up @@ -141,7 +143,7 @@ endif
# general project vars
project_inc = include_directories('src')
project_libs = []
project_deps = declare_dependency(dependencies: [ fmt_dep, yamlcpp_dep, hipo_dep ]) # do NOT include ROOT here
project_deps = declare_dependency(dependencies: [ fmt_dep, yamlcpp_dep, hipo_dep, onetbb_dep ]) # do NOT include ROOT here
project_etc = get_option('sysconfdir') / meson.project_name()
project_test_env = environment()
project_pkg_vars = [
Expand Down
1 change: 1 addition & 0 deletions src/iguana/algorithms/clas12/ZVertexFilter/Algorithm.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "iguana/algorithms/Algorithm.h"
#include <oneapi/tbb/concurrent_hash_map.h>

namespace iguana::clas12 {

Expand Down
1 change: 1 addition & 0 deletions subprojects/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
packagecache
/thread-pool*
/onetbb
8 changes: 8 additions & 0 deletions subprojects/onetbb.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[wrap-git]
url = https://github.com/oneapi-src/oneTBB
revision = v2021.13.0
depth = 1
method = cmake

[provide]
onetbb = tbb_dep

0 comments on commit 1212b12

Please sign in to comment.