update CMakeLists.txt
merge
merge branch