CMakeLists.txt edits