fixes  bugs #101047 and bug #101049 to keep CMake with latest changes in trunk.


git-svn-id: http://root.cern.ch/svn/root/trunk@49130 27541ba8-7e3a-0410-8455-c3a389f83636