Cmake fixes

Small cmake fixes to help installing on OSX (and others). Mostly trying to bring the build system in-line with that which will be provided by GR soon (once I get those in a pull request).