Merge newer root CMakeLists.
Resurrect my CMakeLists changes.