pull request to merge latest changes of CMakeLists.txt