More work on CMake.