Reworking to give more options to build with and without OpenCL