Skip to content

Depend on ros_environment for Humble detection #107

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
facontidavide merged 1 commit into from
Dec 21, 2025
Merged

Depend on ros_environment for Humble detection #107

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<!-- ROS2 dependencies -->
<buildtool_depend>ament_cmake</buildtool_depend>

<depend>ros_environment</depend>
<depend>rclcpp</depend>
<depend>rcpputils</depend>
<depend>rosbag2_transport</depend>
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_link_libraries( TopicPublisherROS2 commonROS)
message("AMENT_PREFIX_PATH = ${AMENT_PREFIX_PATH}")
message("ROS_DISTRO (env) = $ENV{ROS_DISTRO}")

if("${AMENT_PREFIX_PATH}" STREQUAL "/opt/ros/humble" OR "$ENV{ROS_DISTRO}" STREQUAL "humble")
if("$ENV{ROS_DISTRO}" STREQUAL "humble")
message(STATUS "Detected Humble")
target_compile_definitions(DataLoadROS2 PUBLIC ROS_HUMBLE)
target_compile_definitions(TopicPublisherROS2 PUBLIC ROS_HUMBLE)
Expand Down