Update CMake to match hdf5#816

lrknox merged 2 commits intoHDFGroup:masterHDFGroup/hdf4:masterfrom

byrnHDF:master-cmake-updbyrnHDF/hdf4:master-cmake-updCopy head branch name to clipboard