Merge branch 'cgg-cmake' into 'master'

Some CMake improvements

See merge request !8
6 jobs for master in 6 minutes and 44 seconds (queued for 1 second)