Modified CMakeLists.txt files for catkin compilation