CMake updates: