modified CMakeLists.txt to deal with new catkin workspace