Clean up of cmake files
Merge branch 'master' of https://github.com/hpicgs/cmake-init