Updating to use catkin to generate cmake files