merge cmake to master branch