adjusting to cmake.bbclass changes in OE-Core (resolves #229)
Merge branch '229'

Resolved conflicts:
	recipes-ros/octomap-ros/octomap-ros_0.3.0.bb