From ff3ccc1f2315d3de91ee6a90c8754ea554965c1d Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Nov 2016 09:03:56 -0400 Subject: [PATCH] FindHDF5: Restore pre-3.6 behavior of finding only C by default Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) changed the default behavior from finding only the C bindings to finding everything for the enabled languages. Restore the original behavior for compatibility and because many projects need only the C bindings. Closes: #16397 --- Modules/FindHDF5.cmake | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index ab046e3b6..7e1b352ff 100644 --- 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)