Minimal changes in CMakeLists.txt