Merge branch '2-adapt-to-core-cmake-refactor' into 'devel'

Resolve "Adapt to core cmake refactor"

Closes #2

See merge request !2
3 jobs for devel