Change cmake files and split the dependencies config to different files
Merge branch 'master' into devel