Skip to content

Fix thread issues added upstream #56

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
David-LP99 merged 1 commit into from
Sep 8, 2026
+15 −10
Merged

Fix thread issues added upstream #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ include(CheckLibraryExists)

find_package(ament_cmake REQUIRED)
find_package(ament_cmake_ros_core REQUIRED)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
if (NOT RCUTILS_NO_THREAD_SUPPORT)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
endif()

if(UNIX AND NOT APPLE)
include(cmake/check_c_compiler_uses_glibc.cmake)
Expand Down Expand Up @@ -47,7 +49,7 @@ endif()
set(rcutils_sources
src/allocator.c
src/array_list.c
src/base64.c
$<$<NOT:$<BOOL:${RCUTILS_MICROROS}>>:src/base64.c>
src/char_array.c
src/cmdline_parser.c
src/env.c
Expand Down Expand Up @@ -105,12 +107,13 @@ configure_file(
target_link_libraries(${PROJECT_NAME}
PUBLIC
ament_cmake_ros_core::ament_ros_defaults
PRIVATE
Threads::Threads
)
if(NOT RCUTILS_NO_FILESYSTEM)
target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
endif()
if (NOT RCUTILS_NO_THREAD_SUPPORT)
target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
endif()

check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS)

Expand Down Expand Up @@ -700,11 +703,13 @@ if(BUILD_TESTING)
target_link_libraries(benchmark_err_handle ${PROJECT_NAME} ament_cmake_ros_core::ament_ros_defaults)
endif()

ament_add_gtest(test_base64
test/test_base64.cpp
)
if(TARGET test_base64)
target_link_libraries(test_base64 ${PROJECT_NAME} ament_cmake_ros_core::ament_ros_defaults)
if(NOT RCUTILS_MICROROS)
ament_add_gtest(test_base64
test/test_base64.cpp
)
if(TARGET test_base64)
target_link_libraries(test_base64 ${PROJECT_NAME} ament_cmake_ros_core::ament_ros_defaults)
endif()
endif()
endif()

Expand Down