Skip to content

Fix thread issues added upstream (backport #56) #57

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 3 commits into from
Sep 8, 2026
Merged

Fix thread issues added upstream (backport #56) #57

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8524d66
Fix thread issues from upstream (#56)
David-LP99 Sep 8, 2026
767aa0e
Fix conflicts
David-LP99 Sep 8, 2026
b208d78
Fix CMakeLists
David-LP99 Sep 8, 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
17 changes: 9 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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 @@ -100,11 +100,10 @@ configure_file(
)

target_link_libraries(${PROJECT_NAME}
${CMAKE_DL_LIBS}
ament_cmake_ros_core::ament_ros_defaults
)
if(NOT RCUTILS_NO_FILESYSTEM)
target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS})
endif()

check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS)
Expand Down Expand Up @@ -694,11 +693,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