More work on CMake, building documentation works