new cmake
fix merge