Revert "Large CMake update" into 'master'

This reverts merge request !2 (merged)

since the latest changes broke the packaging of Ubuntu distribution kits, we revert those for the moment.

We will merge those changes later when we will have time to test the Ubuntu packaging workflow properly.