CMake updated