Update CMakeLists.txt
Update CMakeLists.txt
Merge branch 'master' into develop