Further work on CMake.