Outstanding changes to cmakelists