Update CMakeLists.txt
merge