From abde161a65a71e1b3e2466d6221b1387b7dc2c94 Mon Sep 17 00:00:00 2001 From: TexLeeV Date: Fri, 27 Mar 2026 17:42:02 -0500 Subject: [PATCH 1/2] force TBB linker --- learning_stl/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/learning_stl/CMakeLists.txt b/learning_stl/CMakeLists.txt index 68c6219..96e1f89 100644 --- a/learning_stl/CMakeLists.txt +++ b/learning_stl/CMakeLists.txt @@ -1,7 +1,9 @@ # STL Deep Dive test suite +find_package(TBB REQUIRED) + 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) From f3140c884a5b0c843c5147c43e167b03f6fd5e92 Mon Sep 17 00:00:00 2001 From: TexLeeV Date: Fri, 27 Mar 2026 17:55:54 -0500 Subject: [PATCH 2/2] fetch content for TBB dependency --- .github/workflows/ci.yml | 4 ++-- CMakeLists.txt | 11 +++++++++++ learning_stl/CMakeLists.txt | 2 -- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff8971a..d7844fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }}" diff --git a/CMakeLists.txt b/CMakeLists.txt index bcb3ea2..f4fe060 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/learning_stl/CMakeLists.txt b/learning_stl/CMakeLists.txt index 96e1f89..f5a55c4 100644 --- a/learning_stl/CMakeLists.txt +++ b/learning_stl/CMakeLists.txt @@ -1,7 +1,5 @@ # STL Deep Dive test suite -find_package(TBB REQUIRED) - 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 TBB::tbb)