CMakeLists.txt revised