CMake modifications complete