CMake: corrections after elfring reviews