More work on CMake