diff --git a/ThirdParty/hdf5/update.sh b/ThirdParty/hdf5/update.sh
index a7055c47201000e81d8ed55290c77ca2735bbcf4..80af1aa25ec488021b4ab73a975f0334544190af 100755
--- a/ThirdParty/hdf5/update.sh
+++ b/ThirdParty/hdf5/update.sh
@@ -8,7 +8,7 @@ readonly name="hdf5"
 readonly ownership="HDF Upstream <kwrobot@kitware.com>"
 readonly subtree="ThirdParty/$name/vtk$name"
 readonly repo="https://gitlab.kitware.com/third-party/hdf5.git"
-readonly tag="for/vtk-20190606-1.10.5"
+readonly tag="for/vtk-20190618-1.10.5"
 readonly paths="
 CMakeFilters.cmake
 CMakeInstallation.cmake
diff --git a/ThirdParty/hdf5/vtkhdf5/CMakeLists.txt b/ThirdParty/hdf5/vtkhdf5/CMakeLists.txt
index 1caf0dfb8616e2aee4ac48065d4fc1318a137235..c32875fe38aacdb53ad864707853f85dbf4d9fd9 100644
--- a/ThirdParty/hdf5/vtkhdf5/CMakeLists.txt
+++ b/ThirdParty/hdf5/vtkhdf5/CMakeLists.txt
@@ -49,8 +49,12 @@ endif ()
 #   dependencies to this variable so that external projects pick them up
 #
 #option (HDF5_EXTERNAL_LIB_PREFIX "Use prefix for custom library naming." "")
+if (FALSE) # XXX(kitware): Hardcode settings.
 set (HDF5_EXTERNAL_LIB_PREFIX "" CACHE STRING "Use prefix for custom library naming.")
 mark_as_advanced (HDF5_EXTERNAL_LIB_PREFIX)
+else ()
+set(HDF5_EXTERNAL_LIB_PREFIX "")
+endif ()
 # HDF5_EXTERNAL_LIB_PREFIX :
 #   If the parent project needs to install hdf libraries, but avoid
 #   name conflicts with system versions, then a prefix may be added
diff --git a/ThirdParty/hdf5/vtkhdf5/config/cmake/HDFCompilerFlags.cmake b/ThirdParty/hdf5/vtkhdf5/config/cmake/HDFCompilerFlags.cmake
index d7393fe86a6c4cfd5daa24ce8f69137280bf6da0..0a4b50a0b016aa377a320ce4805da719c55506a9 100644
--- a/ThirdParty/hdf5/vtkhdf5/config/cmake/HDFCompilerFlags.cmake
+++ b/ThirdParty/hdf5/vtkhdf5/config/cmake/HDFCompilerFlags.cmake
@@ -12,7 +12,9 @@
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
+if (FALSE) # XXX(kitware): Silence extraneous messages.
 message (STATUS "Warnings Configuration:")
+endif ()
 set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
diff --git a/ThirdParty/hdf5/vtkhdf5/config/cmake_ext_mod/HDFMacros.cmake b/ThirdParty/hdf5/vtkhdf5/config/cmake_ext_mod/HDFMacros.cmake
index 815ba8d3261a52d04f992e413419fc72ddaeed9b..60d457874a1f90ee66255535e2f5d8adb7958bd4 100644
--- a/ThirdParty/hdf5/vtkhdf5/config/cmake_ext_mod/HDFMacros.cmake
+++ b/ThirdParty/hdf5/vtkhdf5/config/cmake_ext_mod/HDFMacros.cmake
@@ -360,6 +360,7 @@ macro (HDF_DIR_PATHS package_prefix)
     endif ()
   endif ()
 
+  if (FALSE) # XXX(kitware): VTK handles library naming.
   set (CMAKE_SKIP_BUILD_RPATH  FALSE)
   set (CMAKE_INSTALL_RPATH_USE_LINK_PATH  FALSE)
   set (CMAKE_BUILD_WITH_INSTALL_RPATH ON)
@@ -374,6 +375,7 @@ macro (HDF_DIR_PATHS package_prefix)
   else ()
     set (CMAKE_INSTALL_RPATH "\$ORIGIN/../${${package_prefix}_INSTALL_LIB_DIR}:\$ORIGIN/")
   endif ()
+  endif ()
 
   if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}")
     set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})