fix CMakeLists.txt and package.xml for catkin_make