CMakeLists.txt catkinization update