#6 make cmake scripts uniform