Merge pull request #2 from dkarkoulis/dk-dev

Fixing Cmake for the OpenCL build.
On-going fixes for the OpenCL build