Second iteration of updating CMake build for ROOT6.