Fix compilation on Ubuntu 18.04 w ROS Melodic #130
Conversation
use RethinkRobotics/baxter_simulator#130 (Fix compilation on Ubuntu 18.04 w ROS Melodic) for baxter_simulator install only jsk_maps from jsk_demos
|
@knorth55 could you please check? The only difference from your review is the conditional inclusion of the header |
|
PR #129 is also strictly related. Use of |
|
Oh, I forgot to tell you to include |
|
By the way, this repository is no longer maintained, but no one succeeded the release and maintenance permission. |
|
Thank you for linking. |
| @@ -34,6 +34,9 @@ | |||
| #include <cstring> | |||
| #include <ros/ros.h> | |||
| #include <baxter_sim_kinematics/arm_kinematics.h> | |||
| #if ROS_VERSION_MINIMUN(1, 14, 0) //Melodic | |||
There was a problem hiding this comment.
I'm so sorry, but my original comment was typo.
ROS_VERSION_MINIMUN -> ROS_VERSION_MINIMUM
can you correct this?
| @@ -245,8 +248,13 @@ bool Kinematics::loadModel(const std::string xml) { | |||
| */ | |||
| bool Kinematics::readJoints(urdf::Model &robot_model) { | |||
| num_joints = 0; | |||
| #if ROS_VERSION_MINIMUN(1, 14, 0) // Melodic | |||
There was a problem hiding this comment.
I'm so sorry, but my original comment was typo.
ROS_VERSION_MINIMUN -> ROS_VERSION_MINIMUM
can you correct this?
|
Closing for obsolescence |
On systems with qt-moc versione 5 or above, MOC generation fails.
This patch excludes ros includes (and thus the problematic boost includes) from sources during MOC generation.
This patch also migrates to std::shared_ptr, as it seems that URDF library migrated to them, leading to build errors.