Miro soracore ubuntu20 #307
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marinagmoreira
commented
Oct 28, 2021
| @@ -88,15 +88,15 @@ add_library(dds_ros_bridge | |||
| ) | |||
| target_compile_definitions(dds_ros_bridge PUBLIC ${RTIDDS_DEFINE_FLAGS}) | |||
| add_dependencies(dds_ros_bridge ${catkin_EXPORTED_TARGETS}) | |||
| target_link_libraries(dds_ros_bridge rapidIo ${Boost_LIBRARIES} ${catkin_LIBRARIES}) | |||
| target_link_libraries(dds_ros_bridge rapidIo Qt5::Xml ${Boost_LIBRARIES} ${catkin_LIBRARIES}) | |||
|
|
|||
|
|
|||
| add_library(astrobee_astrobee_bridge | |||
| src/astrobee_astrobee_bridge.cc | |||
| ) | |||
| target_compile_definitions(astrobee_astrobee_bridge PUBLIC ${RTIDDS_DEFINE_FLAGS}) | |||
There was a problem hiding this comment.
Unrelated to this PR, but not sure why we have a separate astrobee_astrobee_bridge library when the dds_ros_bridge includes it
There was a problem hiding this comment.
not sure... do you know @kbrowne15 @rgarciaruiz ?
There was a problem hiding this comment.
Ruben is looking into it :)
|
Let's test on the robot first and then come back to this. |
|
tested on the robot and dds nodes crashed, meaning we might beed to update the debians at the same time as we merge this in |
marinagmoreira
force-pushed
the
miro_soracore_ubuntu20
branch
from
273b625
to
a5f6e96
Compare
|
I added IFs to make it qt4 on older versions, not a very cmake code but tested on the robot and in ubuntu20 |
bcoltin
approved these changes
Dec 16, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Compiling miro, soracore and astrobee with qt5, working in ubuntu 16-20