Additional CMake file changes