Skip to content
This repository has been archived by the owner on Nov 13, 2017. It is now read-only.

Fixes for 23, 27 and 28 #29

Merged
merged 5 commits into from
May 26, 2014
Merged

Fixes for 23, 27 and 28 #29

merged 5 commits into from
May 26, 2014

Conversation

gavanderhoorn
Copy link
Contributor

These commits contain proposed fixes for the referenced issues.

I've had to update the way create_ikfast_moveit_plugin.py works with package dependencies, as cmake_modules is only a build_depend.

@gavanderhoorn
templates: cmake_modules provides FindEigen, so explicitly depend on …
9be5612 
…it. Fix moveit#27.

Also change order of `find_package(..)` statements to reflect this and
update dependency checking in pkg generator script to allow for different
run and build depends (`cmake_modules` is only a `build_depend`).
@gavanderhoorn
templates: remove superfluous link_directories(). Fix moveit#23.
7db070a
@gavanderhoorn
templates: include planning group name in plugin desc install rule. Fix
edf37dc 
moveit#28.
@gavanderhoorn
scripts: any change to run or build depends should trigger manifest u…
829eff6 
…pdating.
@gavanderhoorn
Copy link
Contributor Author

Ping?

@davetcoleman
Copy link
Member

Thanks for all these fixes!

I made some comments on the individual commits, I probably should have done them here instead, oops

@gavanderhoorn
Copy link
Contributor Author

I've removed find_package(Eigen ..) from the CMakeLists.txt template, as it does indeed seem to be not used (anymore). This also removes the need for the dependency on cmake_modules, and consequently doesn't require separate handling of the run and build dependencies, but I've left the extended checking / injection in create_ikfast_moveit_plugin.py. Might be of some use in the future (but feel free to remove it).

@davetcoleman
Copy link
Member

Great work, thanks!

davetcoleman added a commit that referenced this pull request May 26, 2014
@davetcoleman
Merge pull request #29 from gavanderhoorn/for_master_issue23_27_28
2dd3b60 
Fixes for 23, 27 and 28
@davetcoleman davetcoleman merged commit 2dd3b60 into moveit:master May 26, 2014
@gavanderhoorn gavanderhoorn deleted the for_master_issue23_27_28 branch May 26, 2014 09:51
@gavanderhoorn
Copy link
Contributor Author

Thanks for merging. Makes my life a bit easier when releasing IKFast plugin packages.

gavanderhoorn added a commit to ros-industrial/fanuc_experimental that referenced this pull request May 28, 2014
@gavanderhoorn
moveit_plugins: fixup dependencies in build scripts. Fix #12.
1441d2e 
Instead of regenerating the pkgs (see moveit/moveit_ikfast#29).
@gavanderhoorn gavanderhoorn mentioned this pull request Jun 6, 2014
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@gavanderhoorn @davetcoleman