Skip to content

Commit 1210e5c

Browse files
author
Hackathon User
committed
build: fix TBB linkage for stdexec and finalize lean hpx_main headers
1 parent 46827f6 commit 1210e5c

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

libs/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,14 @@ endif()
514514

515515
if(TARGET STDEXEC::stdexec)
516516
target_link_libraries(hpx_core INTERFACE STDEXEC::stdexec)
517+
518+
# stdexec's exec/tbb/tbb_thread_pool.hpp transitively includes
519+
# <tbb/task_arena.h> which references TBB runtime symbols. Link -ltbb so the
520+
# linker can resolve them.
521+
find_library(TBB_LIBRARY NAMES tbb)
522+
if(TBB_LIBRARY)
523+
target_link_libraries(hpx_core PUBLIC ${TBB_LIBRARY})
524+
endif()
517525
endif()
518526

519527
if(HPX_WITH_PARCELPORT_GASNET AND GASNET_LIBRARY_DIRS)

libs/core/init_runtime_local/include/hpx/init_runtime_local/init_runtime_local.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@
2424
#include <cstdint>
2525
#include <cstring>
2626
#include <functional>
27-
#include <iostream>
2827
#include <string>
2928
#include <utility>
3029
#include <vector>
3130

32-
// Forward declarations replaces sub-module includes to satisfy C++20
31+
// Forward declarations -- replaces sub-module includes to satisfy C++20
3332
// module boundary requirements. Full definitions are available in the
3433
// corresponding .cpp files via their umbrella module includes.
3534
namespace hpx {

libs/full/init_runtime/include/hpx/hpx_init_params.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <string>
2323
#include <vector>
2424

25-
// Forward declaration replaces sub-module includes to satisfy C++20
25+
// Forward declaration -- replaces sub-module includes to satisfy C++20
2626
// module boundary requirements.
2727
namespace hpx {
2828

libs/full/init_runtime/include/hpx/hpx_user_main_config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2007-2025 Hartmut Kaiser
1+
// Copyright (c) 2007-2055 Hartmut Kaiser
22
//
33
// SPDX-License-Identifier: BSL-1.0
44
// Distributed under the Boost Software License, Version 1.0. (See accompanying

0 commit comments

Comments
 (0)