Third iteration of updating CMake build for ROOT6. Trying to follow a moving target :-(