make cmake things more user friendly
Cleanup cmake files