Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion patch/ros-noetic-ros-type-introspection.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32fda3d..777de2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
@@ -9,7 +9,13 @@ find_package(catkin REQUIRED COMPONENTS
)

# Build flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ")
+
+# macOS: emit an @rpath install-name id for the built dylib. The old
+# cmake_minimum_required leaves policy CMP0042 = OLD, so without this the
+# library id is a bare 'libros_type_introspection.dylib' and @rpath resolution
+# fails for every consumer (e.g. the plotjuggler-ros plugins).
+set(CMAKE_MACOSX_RPATH ON)

catkin_package(
INCLUDE_DIRS include
4 changes: 4 additions & 0 deletions pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ apriltag:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
apriltag_ros:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"

# Remove everything after this line on a full rebuild
ros_type_introspection:
build_number: 25
2 changes: 1 addition & 1 deletion vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ conda_index:
- robostack.yaml
- packages-ignore.yaml

# Reminder for next full rebuild, the next build number should be 25
# Reminder for next full rebuild, the next build number should be 26
build_number: 24

mutex_package:
Expand Down