Update CMakeLists.txt with latest file changes