Accommodate some changes in recent cmake for HDF5 finding