Merge branch 'FindHDF5-restore-default-C' into release-3.6

Kitware · Nov 2, 2016 · 967e9aa · 967e9aa
2 parents de25d98 + ff3ccc1
commit 967e9aa
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
@@ -111,18 +111,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 set(HDF5_VALID_LANGUAGE_BINDINGS C CXX Fortran)
 
 # Validate the list of find components.
-set(HDF5_LANGUAGE_BINDINGS)
 if(NOT HDF5_FIND_COMPONENTS)
-  get_property(__langs GLOBAL PROPERTY ENABLED_LANGUAGES)
-  foreach(__lang IN LISTS __langs)
-    if(__lang MATCHES "^(C|CXX|Fortran)$")
-      list(APPEND HDF5_LANGUAGE_BINDINGS ${__lang})
-      set(HDF5_FIND_REQUIRED_${__lang} True)
-    endif()
-  endforeach()
-  set(FIND_HL ON)
-  set(HDF5_FIND_REQUIRED_HL True)
+  set(HDF5_LANGUAGE_BINDINGS "C")
 else()
+  set(HDF5_LANGUAGE_BINDINGS)
   # add the extra specified components, ensuring that they are valid.
   set(FIND_HL OFF)
   foreach(component IN LISTS HDF5_FIND_COMPONENTS)