You have this set up on 2.50.x? Or just master?

In other words, if the source files are already in a state where they can be easily unity'd together, I can add a unity configuration right away. If there are #define and global variable conflicts galore that require fixes from the master branch, let's finish getting the cmake branch working for most people and then make incorporating the source tree changes a high-priority follow up.