Skip to content
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

added libxi and libxmu as dependencies for ros build farm #62

Merged
merged 4 commits into from
Mar 13, 2017

Conversation

ipa-rmb
Copy link
Contributor

@ipa-rmb ipa-rmb commented Mar 9, 2017

maybe this fixes the build farm error - please do not merge until approved by me

@ipa-rmb
Copy link
Contributor Author

ipa-rmb commented Mar 9, 2017

Now the ROS build farm is fine with all the packages. You can merge.

DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
#install(DIRECTORY common/include
# DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
#)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the commented lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it. The new code is written directly below, without comments. I just left the old code because I was not sure whether the new one or the old one is correct. If you tell me which is right, I will just delete the other.

So do we take option 1 or 2:
1.
install(DIRECTORY common/include
DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})

install(DIRECTORY common/include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, 2 is fine - we discussed this

@ipa-rmb ipa-rmb merged commit dce368a into ipa320:indigo_dev Mar 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants