merge cmake fixed