Complete the fix for ROOT-5736 (CMake)
Fix for ROOT-5751 (CMake)