Cmake overhaul

Max Lyonrequested to merge
cmake-overhaul into master

Merge request reports