Update CMakelist to match Makefile.am in oc2