Issue/cmake cleanup

Praetorius, Simonrequested to merge
issue/cmake_cleanup into master

Added some more fixes to old cmake versions

Merge request reports