Changes to CMake to cope with the new rootPCMs (ROOT-6199)