Fixed CMake to match new Catkin behavior