Closed jvarley closed 8 years ago
Agreed on most accounts. The use of git submodule looks fine to me.
However, the idea here was always to allow catkin to fully build graspit (so it can be built on the ROS build farm). Could we add the git submodule commands as custom commands in CMakeLists, the way the svn checkout was done before?
Also, the patches were meant so that whenever building graspit in ros, we would depend on and be lined against household_objects_database. I agree 100% that this is not the right way of doing it, but until we have extracted both database interfaces as plugins (and graspit can build cleanly by itself) I would prefer the ROS version to be built with household_objects_database by default.
@mateiciocarlie
DONE! and actually pretty.
I don't know why I had so much trouble getting this to work before. the CMakeLists.txt now does the following:
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/graspit_source/graspit.pro
COMMAND git submodule init
COMMAND git submodule update
COMMAND patch -N -d graspit_source -p0 < graspit_project.patch
COMMAND patch -N -d graspit_source -p0 < graspit_dbase.patch
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
And it builds/runs fine.
@mateiciocarlie
1) removed patches as we are not using them. 2) switches to git submodules to pull in graspit 3) fixed build command to not apply patches or pull from svn.
This works for now as a way to have it pull from github rather than svn in order to work with plugins. In the end of the day, I think this package should cease to exist, and graspit should have a make install target.