diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-02 11:45:37 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-02 11:45:37 -0400 |
| commit | 967e9aafda9054a3e963923d14514075225f7792 (patch) | |
| tree | a62ce21e265dad6bc0b92688a590290932797ac1 | |
| parent | de25d988bccc2d81ce137d763246aadafda336ea (diff) | |
| parent | ff3ccc1f2315d3de91ee6a90c8754ea554965c1d (diff) | |
| download | cmake-967e9aafda9054a3e963923d14514075225f7792.tar.gz | |
Merge branch 'FindHDF5-restore-default-C' into release-3.6
| -rw-r--r-- | Modules/FindHDF5.cmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index ab046e3b69..7e1b352ff7 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) |