GitLab

* Fix generated CMake file

* Make optional dependencies consistent
Co-authored-by: Vasilis Vryniotis <datumbox@users.noreply.github.com>