Feature/cmakelists

Merged Timo Koch requested to merge feature/cmakelists into master
Edited by Timo Koch

Merge request reports