Merge branch 'cmake_corrected_cmakelists' into 'master'

Cmake corrected cmakelists

See merge request !18
2 jobs for master in 5 minutes and 52 seconds
Status Job ID Name Coverage
  Windows
passed #250264
Windows10
masterJobWindows

00:02:11

 
  Linux
passed #250265
masterJobLinux

00:03:40