Update CMake

Bram Veenboerrequested to merge
fix-cmake into master

The CMake configuration had several issues, which are now resolved.

Merge request reports