Update to synch with latest cmake

git-svn-id: https://svn.hdfgroup.uiuc.edu/hdf5/trunk@24849 dab4d1a6-ed17-0410-a064-d1ae371a2980