CMakeLists.txt maintenance