- improved cmake scripts