Merge branch 'fix-findhdf5-old-cmake' into r7.1.1

Merge-request: !2608
Kitware · Mar 20, 2017 · caaa74e · caaa74e
2 parents 543a26c + b86ceca
commit caaa74e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/CMake/NewCMake/FindHDF5.cmake b/CMake/NewCMake/FindHDF5.cmake
@@ -480,8 +480,13 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
       set(HDF5_COMPILER_NO_INTERROGATE False)
       # If this language isn't using the wrapper, then try to seed the
       # search options with the wrapper
+      if (${CMAKE_VERSION} VERSION_LESS "3.4")
+        set(names_per_dir_opt "")
+      else()
+        set(names_per_dir_opt "NAMES_PER_DIR")
+      endif()
       find_program(HDF5_${__lang}_COMPILER_EXECUTABLE
-        NAMES ${HDF5_${__lang}_COMPILER_NAMES} NAMES_PER_DIR
+        NAMES ${HDF5_${__lang}_COMPILER_NAMES} ${names_per_dir_opt}
         PATH_SUFFIXES bin Bin
         DOC "HDF5 ${__lang} Wrapper compiler.  Used only to detect HDF5 compile flags."
       )