-
Notifications
You must be signed in to change notification settings - Fork 17
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
Use target_compile_defs with exported defs from industrial_core #12
Use target_compile_defs with exported defs from industrial_core #12
Conversation
industrial_robot_client now exports the exact compile definitions used to build the library we use, so use them.
99f533f
to
ff4a5f6
Compare
Rebased to use CI. |
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.
This seems reasonable enough to me with the recent changes to industrial_core. @Levi-Armstrong , you are listed as the maintainer here, could you take a look and potentially merge? This is currently causing us to not be able to sync Melodic.
Actually, we might want to revert ros-industrial/industrial_core#262 in We unfortunately released We'd probably want/need to branch |
All right, that's another option. Should I revert ros/rosdistro#30043 for now, and then we can update it as needed later on? That will unblock the Melodic sync that I would like to start getting ready for. |
If you can wait 5 minutes I'll do a new release of If not, you could revert. |
Waiting is fine, I just wasn't sure how much work it would be :). |
I've submitted ros/rosdistro#30228 instead. |
I'm going to close this here for now, and retarget and re-open it later. |
I'm actually not going to revert ros-industrial/industrial_core#262. See ros-industrial/industrial_core#274 (comment). That doesn't change anything wrt the |
Re-opening, as migrating to |
Since ros-industrial/industrial_core#262,
industrial_core
exports its compiler definitions.abb_driver
depends onindustrial_robot_client
andsimple_message
, and should use those exported definitions, instead of hard-coding them in its ownCMakeLists.txt
.The changes in this PR do that.
Note: this PR will fail CI until
industrial_core
sees a new release, as the CI configuration installsindustrial_core
using the released packages. As the most recent release ofindustrial_core
does not include ros-industrial/industrial_core#262, the variable referenced in this PR does not exist and the build will fail.