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

Cleans up CMakeLists and fixes install rules #31

Merged
merged 1 commit into from
Feb 8, 2018

Conversation

IanTheEngineer
Copy link
Contributor

This fixes a few issues with CMakeLists and install
rules that are required in order to release the debian
packages of sawyer_simulator, and improves the build
process when using catkin_make.

Copy link

@rethink-forrest rethink-forrest left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

Copy link
Contributor

@jarvisschultz jarvisschultz left a comment

Choose a reason for hiding this comment

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

Overall looks great, and it worked on my system. Might want to check out the one comment that I left.

install(TARGETS ${PROJECT_NAME}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)
install(DIRECTORY config include launch
Copy link
Contributor

Choose a reason for hiding this comment

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

Would you rather install the include dir to ${CATKIN_PACKAGE_INCLUDE_DESTINATION}?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're quite correct. We haven't been consistent on this, and I think the INCLUDE_DESTINATION is the correct directory. I'll update accordingly.

This fixes a few issues with CMakeLists and install
rules that are required in order to release the debian
packages of sawyer_simulator, and improves the build
process when using catkin_make.
@IanTheEngineer IanTheEngineer merged commit 84e1883 into release-5.2.0 Feb 8, 2018
@IanTheEngineer IanTheEngineer deleted the cmake_lists_cleanup branch March 9, 2018 14:36
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.

3 participants