From f56963cf054832995488287af7b8c4abd6c8e4dd Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Nov 2021 13:05:18 -0400 Subject: FindHDF5: clear library output variables at the top of the module This avoids accumulation of `HDF5_LIBRARIES` results when calling `find_package(HDF5)` multiple times within a single scope. --- Modules/FindHDF5.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Modules') diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index e33535513a..ce08728b23 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -161,6 +161,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) # scope somewhere else. We can't rely on it because different components may # have been requested for this call. set(HDF5_FOUND OFF) +set(HDF5_LIBRARIES) +set(HDF5_HL_LIBRARIES) # List of the valid HDF5 components set(HDF5_VALID_LANGUAGE_BINDINGS C CXX Fortran) -- cgit v1.2.1 From 247f1149e1035f6a9cd95620016364015c34807b Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Nov 2021 13:24:30 -0400 Subject: FindHDF5: clear language-specific libraries list before discovery --- Modules/FindHDF5.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Modules') diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index ce08728b23..bda392da34 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -588,6 +588,9 @@ if(NOT HDF5_FOUND) set(HDF5_COMPILER_NO_INTERROGATE TRUE) # Only search for languages we've enabled foreach(_lang IN LISTS HDF5_LANGUAGE_BINDINGS) + set(HDF5_${_lang}_LIBRARIES) + set(HDF5_${_lang}_HL_LIBRARIES) + # First check to see if our regular compiler is one of wrappers if(_lang STREQUAL "C") _HDF5_test_regular_compiler_C( @@ -813,6 +816,9 @@ if( NOT HDF5_FOUND ) endif() foreach(_lang IN LISTS HDF5_LANGUAGE_BINDINGS) + set(HDF5_${_lang}_LIBRARIES) + set(HDF5_${_lang}_HL_LIBRARIES) + # The "main" library. set(_hdf5_main_library "") -- cgit v1.2.1