修复cmake错误
merge