update cmake patch
Rebase from 'upstream'
added catkin specific commands to build system
update cmake patch