Update base project and CMakeLists