created unified cmake list for both ochre & cinnabar, removed old individual ones