From 2c00a77ea333a251ce43e0eb3eaa0e7872973359 Mon Sep 17 00:00:00 2001 From: Mateusz Jakub Fila Date: Tue, 17 Nov 2026 11:28:23 +0100 Subject: [PATCH 1/2] link TBB if libstdc++ uses it --- CMakeLists.txt | 4 ++++ cmake/std_par.cmake | 22 ++++++++++++++++++++++ examples/CMakeLists.txt | 3 +++ tests/beman/execution/CMakeLists.txt | 1 + 4 files changed, 30 insertions(+) create mode 100644 cmake/std_par.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index c61df50e0..25e73ee7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,10 @@ beman_install_library(${BEMAN_EXECUTION_TARGET_PREFIX} TARGETS ${BEMAN_EXECUTION ) #=============================================================================== +if(BEMAN_EXECUTION_BUILD_TESTS OR BEMAN_EXECUTION_BUILD_EXAMPLES) + include(cmake/std_par.cmake) +endif() + if(BEMAN_EXECUTION_BUILD_TESTS) enable_testing() add_subdirectory(tests/beman/execution) diff --git a/cmake/std_par.cmake b/cmake/std_par.cmake new file mode 100644 index 000000000..b75561b57 --- /dev/null +++ b/cmake/std_par.cmake @@ -0,0 +1,22 @@ +# gersemi: off +# cmake/std_par.cmake +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +# gersemi: on + +# Defines beman.execution.std_par: an INTERFACE target executables link to when +# libstdc++'s needs TBB. +if(NOT TARGET beman.execution.std_par) + include(CheckCXXSourceCompiles) + check_cxx_source_compiles( + "#include + #include + #include + int main() { std::vector v{2, 1}; std::sort(std::execution::par, v.begin(), v.end()); }" + BEMAN_EXECUTION_STD_PAR_LINKS + ) + add_library(beman.execution.std_par INTERFACE) + if(NOT BEMAN_EXECUTION_STD_PAR_LINKS) + find_package(TBB REQUIRED) + target_link_libraries(beman.execution.std_par INTERFACE TBB::tbb) + endif() +endif() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 58d27b9d8..97904410e 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -17,6 +17,8 @@ if(PROJECT_IS_TOP_LEVEL) enable_testing() endif() +include(../cmake/std_par.cmake) + set(TODO suspend_never) #-dk:TODO including that causes ASAN errors set(EXAMPLES @@ -60,5 +62,6 @@ foreach(EXAMPLE ${EXAMPLES}) PRIVATE beman::execution_headers ) endif() + target_link_libraries(${EXAMPLE_TARGET} PRIVATE beman.execution.std_par) add_test(NAME ${EXAMPLE_TARGET} COMMAND ${EXAMPLE_TARGET}) endforeach() diff --git a/tests/beman/execution/CMakeLists.txt b/tests/beman/execution/CMakeLists.txt index 9b2b7b92e..77b148e1a 100644 --- a/tests/beman/execution/CMakeLists.txt +++ b/tests/beman/execution/CMakeLists.txt @@ -142,6 +142,7 @@ foreach(test ${execution_tests}) else() target_link_libraries(${TEST_EXE} PRIVATE beman::execution_headers) endif() + target_link_libraries(${TEST_EXE} PRIVATE beman.execution.std_par) target_compile_definitions(${TEST_EXE} PRIVATE NOMINMAX) add_test(NAME ${TEST_EXE} COMMAND $) endforeach() From e48f78496de5e56eaf832ce9308c41553afe7cbf Mon Sep 17 00:00:00 2001 From: Mateusz Jakub Fila Date: Wed, 18 Nov 2026 16:00:12 +0100 Subject: [PATCH 2/2] use macro to disable TBB backend for std par --- CMakeLists.txt | 4 ---- cmake/std_par.cmake | 22 ---------------------- examples/CMakeLists.txt | 11 +++++++---- tests/beman/execution/CMakeLists.txt | 9 +++++++-- 4 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 cmake/std_par.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 25e73ee7c..c61df50e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,10 +131,6 @@ beman_install_library(${BEMAN_EXECUTION_TARGET_PREFIX} TARGETS ${BEMAN_EXECUTION ) #=============================================================================== -if(BEMAN_EXECUTION_BUILD_TESTS OR BEMAN_EXECUTION_BUILD_EXAMPLES) - include(cmake/std_par.cmake) -endif() - if(BEMAN_EXECUTION_BUILD_TESTS) enable_testing() add_subdirectory(tests/beman/execution) diff --git a/cmake/std_par.cmake b/cmake/std_par.cmake deleted file mode 100644 index b75561b57..000000000 --- a/cmake/std_par.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# gersemi: off -# cmake/std_par.cmake -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -# gersemi: on - -# Defines beman.execution.std_par: an INTERFACE target executables link to when -# libstdc++'s needs TBB. -if(NOT TARGET beman.execution.std_par) - include(CheckCXXSourceCompiles) - check_cxx_source_compiles( - "#include - #include - #include - int main() { std::vector v{2, 1}; std::sort(std::execution::par, v.begin(), v.end()); }" - BEMAN_EXECUTION_STD_PAR_LINKS - ) - add_library(beman.execution.std_par INTERFACE) - if(NOT BEMAN_EXECUTION_STD_PAR_LINKS) - find_package(TBB REQUIRED) - target_link_libraries(beman.execution.std_par INTERFACE TBB::tbb) - endif() -endif() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 97904410e..97d2875f6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -17,8 +17,6 @@ if(PROJECT_IS_TOP_LEVEL) enable_testing() endif() -include(../cmake/std_par.cmake) - set(TODO suspend_never) #-dk:TODO including that causes ASAN errors set(EXAMPLES @@ -52,7 +50,13 @@ foreach(EXAMPLE ${EXAMPLES}) set(EXAMPLE_TARGET ${PROJECT_NAME}.${EXAMPLE}) add_executable(${EXAMPLE_TARGET}) target_sources(${EXAMPLE_TARGET} PRIVATE ${EXAMPLE}.cpp) - target_compile_definitions(${EXAMPLE_TARGET} PRIVATE NOMINMAX) + target_compile_definitions( + ${EXAMPLE_TARGET} + PRIVATE + NOMINMAX + # disable libstdc++'s TBB backend that would require TBB + _GLIBCXX_USE_TBB_PAR_BACKEND=0 + ) if(BEMAN_USE_MODULES) target_compile_definitions(${EXAMPLE_TARGET} PUBLIC BEMAN_HAS_MODULES) target_link_libraries(${EXAMPLE_TARGET} PRIVATE beman::execution) @@ -62,6 +66,5 @@ foreach(EXAMPLE ${EXAMPLES}) PRIVATE beman::execution_headers ) endif() - target_link_libraries(${EXAMPLE_TARGET} PRIVATE beman.execution.std_par) add_test(NAME ${EXAMPLE_TARGET} COMMAND ${EXAMPLE_TARGET}) endforeach() diff --git a/tests/beman/execution/CMakeLists.txt b/tests/beman/execution/CMakeLists.txt index 77b148e1a..7c61243f6 100644 --- a/tests/beman/execution/CMakeLists.txt +++ b/tests/beman/execution/CMakeLists.txt @@ -142,8 +142,13 @@ foreach(test ${execution_tests}) else() target_link_libraries(${TEST_EXE} PRIVATE beman::execution_headers) endif() - target_link_libraries(${TEST_EXE} PRIVATE beman.execution.std_par) - target_compile_definitions(${TEST_EXE} PRIVATE NOMINMAX) + target_compile_definitions( + ${TEST_EXE} + PRIVATE + NOMINMAX + # disable libstdc++'s TBB backend that would require TBB + _GLIBCXX_USE_TBB_PAR_BACKEND=0 + ) add_test(NAME ${TEST_EXE} COMMAND $) endforeach()