Skip to content

Commit a911d7b

Browse files
authored
Merge pull request #218 from gftabor/rcutils
add rcutils mac patch
2 parents ac42594 + 2614807 commit a911d7b

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

patch/ros-jazzy-rcutils.osx.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index f5ba931..110f4af 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -150,7 +150,7 @@ target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS})
6+
7+
check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS)
8+
9+
-if(HAVE_LIBATOMICS AND NOT WIN32)
10+
+if(HAVE_LIBATOMICS AND NOT WIN32 AND NOT APPLE)
11+
# Exporting link flag since it won't pass ament_export_libraries() existence check
12+
ament_export_link_flags("-latomic")
13+
target_link_libraries(${PROJECT_NAME} atomic)

pkg_additional_info.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,5 @@ ament_xmllint:
197197
build_number: 17
198198
tf_transformations:
199199
build_number: 17
200+
rcutils:
201+
build_number: 17

0 commit comments

Comments
 (0)