CMake configuration mostly converted - need to revise config.h.in now