Added dependency to prevent missing msg header, cleaned up CMakeLists