More cmake cleanup

Merged Jan Möbius requested to merge More_cmake_cleanup into master

Merge request reports