Cleaning cmake files
Merge branch 'devel' into debuild