Further updates to CMake files.