Skip to content

force TBB linker #15

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
TexLeeV merged 2 commits into from
Mar 28, 2026
Merged

force TBB linker #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abde161
force TBB linker
TexLeeV Mar 27, 2026
f3140c8
fetch content for TBB dependency
TexLeeV Mar 27, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y cmake ninja-build libgtest-dev libgmock-dev
sudo apt-get install -y cmake ninja-build

- name: Install dependencies (macOS)
if: runner.os == 'macOS'
run: |
brew update
brew install cmake ninja googletest
brew install cmake ninja

- name: Configure
run: cmake --preset "${{ matrix.preset }}"
Expand Down
11 changes: 11 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ FetchContent_Declare(
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) # MSVC-friendly; harmless elsewhere
FetchContent_MakeAvailable(googletest)

FetchContent_Declare(
onetbb
GIT_REPOSITORY https://github.com/oneapi-src/oneTBB.git
GIT_TAG v2022.3.0
GIT_SHALLOW TRUE
)
set(TBB_TEST OFF CACHE BOOL "" FORCE)
set(TBB_EXAMPLES OFF CACHE BOOL "" FORCE)
set(TBB_INSTALL OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(onetbb)

find_package(Threads REQUIRED)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
Expand Down
2 changes: 1 addition & 1 deletion learning_stl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

add_learning_test(test_container_internals tests/test_container_internals.cpp instrumentation)
add_learning_test(test_iterators tests/test_iterators.cpp instrumentation)
add_learning_test(test_algorithms tests/test_algorithms.cpp instrumentation)
add_learning_test(test_algorithms tests/test_algorithms.cpp instrumentation TBB::tbb)
add_learning_test(test_comparators_hash_functions tests/test_comparators_hash_functions.cpp instrumentation)
add_learning_test(test_iterator_invalidation tests/test_iterator_invalidation.cpp instrumentation)
Loading