Put main CMake changes back in
Put main CMake changes back in

neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon,neilstephens/opendatacon