Merge branch 'issue/cmake_cleanup' into 'master'

Issue/cmake cleanup

Added some more fixes to old cmake versions

See merge request !14
4 jobs for master in 173 minutes and 33 seconds (queued for 9 minutes and 53 seconds)