summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-03 12:54:43 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-03 12:54:43 (GMT)
commitacc2e03d798eeebdecd8198ae8eba495f8ccc5e7 (patch)
tree33fb6c4db9675ec957b57728b101a783a8a2dc79
parent3dd99758d1f912d0edc2df05b6d2cfabd5005efe (diff)
parentff3ccc1f2315d3de91ee6a90c8754ea554965c1d (diff)
downloadCMake-acc2e03d798eeebdecd8198ae8eba495f8ccc5e7.zip
CMake-acc2e03d798eeebdecd8198ae8eba495f8ccc5e7.tar.gz
CMake-acc2e03d798eeebdecd8198ae8eba495f8ccc5e7.tar.bz2
Merge topic 'FindHDF5-restore-default-C'
ff3ccc1f FindHDF5: Restore pre-3.6 behavior of finding only C by default
-rw-r--r--Modules/FindHDF5.cmake12
1 files changed, 2 insertions, 10 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 1c2c443..16764e0 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -100,18 +100,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)