Fix last fix

Merged Rosen Matev requested to merge rm-cmake into master

Merge request reports