-
Notifications
You must be signed in to change notification settings - Fork 52
Bump 1.3.1 #72
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.
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
Bump 1.3.1 #72
Changes from all commits
ced481c
adc554b
8141bf7
a9efa34
3d83c92
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,26 +12,12 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") | |
| add_compile_options(-Wno-ignored-qualifiers -Wno-reorder -Wall -Wextra) | ||
| endif() | ||
|
|
||
| if(DEFINED ENV{ROS_DISTRO}) | ||
| set(ROS_DISTRO $ENV{ROS_DISTRO}) | ||
| endif() | ||
|
|
||
| if(NOT DEFINED ROS_DISTRO OR ROS_DISTRO STREQUAL "") | ||
| execute_process( | ||
| COMMAND printenv ROS_DISTRO | ||
| OUTPUT_VARIABLE ROS_DISTRO | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE | ||
| ) | ||
| endif() | ||
|
|
||
| if(NOT DEFINED ROS_DISTRO OR ROS_DISTRO STREQUAL "") | ||
| message(WARNING "ROS_DISTRO is not defined.") | ||
| endif() | ||
|
|
||
| if(ROS_DISTRO STREQUAL "humble") | ||
| if(EXISTS "/opt/ros/humble") | ||
| add_definitions(-DROS2_HUMBLE) | ||
| elseif(ROS_DISTRO STREQUAL "jazzy" OR ROS_DISTRO STREQUAL "rolling") | ||
| add_definitions(-DROS2_JAZZY_OR_ROLLING) | ||
| message("Humble") | ||
| else() | ||
| add_definitions(-DROS2_LATEST) | ||
| message("Latest") | ||
|
Comment on lines
+19
to
+20
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| endif() | ||
|
Comment on lines
+15
to
21
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The updated method for ROS distribution detection, while simpler, relies on the existence of |
||
|
|
||
| ################################################################################ | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -56,7 +56,7 @@ | |||||
| #include <image_transport/image_transport.hpp> | ||||||
| #ifdef ROS2_HUMBLE | ||||||
| #include <cv_bridge/cv_bridge.h> | ||||||
| #elif defined(ROS2_JAZZY_OR_ROLLING) | ||||||
| #elif defined(ROS2_LATEST) | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider adding a comment to this line to explicitly state the assumption that all non-Humble ROS 2 distributions (covered by
Suggested change
|
||||||
| #include <cv_bridge/cv_bridge.hpp> | ||||||
| #endif | ||||||
|
|
||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo in 'pacakge'; please change it to 'package' to improve the clarity of the package description.