update to latest refactoring of ament_cmake