Various cmake fixes

Merge request reports

Loading