Merge branch 'CMakeUpdate' into 'master'

CMake update

See merge request !13
2 jobs for master in 10 minutes and 11 seconds (queued for 15 minutes and 29 seconds)
Status Job ID Name Coverage
  Windows
passed #163276
Windows10
masterJobWindows

00:04:12

 
  Linux
passed #163277
masterJobLinux

00:05:58

92.0%