My first cmake hackery so would appreciate a sanity check before I just jam this into HEAD
This will create a new commit in order to revert the existing changes.
