Merge in cmake changes for CI from branch.