Skip to content
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

Support building on ROS 2 Jazzy #9

Draft
wants to merge 3 commits into
base: feat/ros2
Choose a base branch
from
+5 −11
Draft

Support building on ROS 2 Jazzy #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d3e908
Remove unused error causing lines
f0reachARR Sep 18, 2024
f9cd402
Change deprecated headers
f0reachARR Sep 18, 2024
1bdb267
Add include file check
f0reachARR Sep 19, 2024
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
6 changes: 0 additions & 6 deletions jsk_rviz_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,6 @@ ament_target_dependencies(jsk_rviz_plugins
# $<INSTALL_INTERFACE:include>
# )

if (NOT WIN32)
ament_environment_hooks(
"${ament_cmake_package_templates_ENVIRONMENT_HOOK_LIBRARY_PATH}"
)
endif()

# Link non ament packages
target_link_libraries(jsk_rviz_plugins Qt5::Widgets)

Expand Down
5 changes: 5 additions & 0 deletions jsk_rviz_plugins/src/overlay_image_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@
#include <OgreTechnique.h>
#include <OgreTexture.h>
#include <OgreTextureManager.h>

#if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp>
#else
#include <cv_bridge/cv_bridge.h>
#endif

#include <rviz_common/uniform_string_stream.hpp>
#include <sensor_msgs/image_encodings.hpp>
Expand Down
5 changes: 0 additions & 5 deletions jsk_topic_tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ target_include_directories(jsk_topic_tools_node
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)

if (NOT WIN32)
ament_environment_hooks(
"${ament_cmake_package_templates_ENVIRONMENT_HOOK_LIBRARY_PATH}")
endif()

ament_export_targets(export_jsk_topic_tools_node HAS_LIBRARY_TARGET)
ament_export_dependencies(rclcpp)
ament_export_libraries(jsk_topic_tools_node)
Expand Down
Loading