cmake files fixed
Merge pull request #13 from uobirlab/devel_manolis

cmake files fixed