summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-06-28 13:20:03 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-06-28 13:20:23 (GMT)
commit353a1357a7ff61f190182250de55171de125326c (patch)
tree0a73e6dd52ac000657af6b0608615f04067bdd9e /Modules
parent81a51a86281a582d1f6940ae4ba575f42eba54d7 (diff)
parentb5bc72574e6e63bb349b3c0b59397446942722a1 (diff)
downloadCMake-353a1357a7ff61f190182250de55171de125326c.zip
CMake-353a1357a7ff61f190182250de55171de125326c.tar.gz
CMake-353a1357a7ff61f190182250de55171de125326c.tar.bz2
Merge topic 'revert-FindHDF5-library' into release-3.24
b5bc72574e FindHDF5: Revert "Add explicit library location instead of guessed ..." Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7416
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindHDF5.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 46ad015..40ed9a9 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -555,8 +555,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
endif()
if( _hdf5_lang_location )
set(HDF5_${_lang}_LIBRARY ${_hdf5_lang_location})
- list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_LIBRARY})
- set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_LIBRARY})
+ list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
+ set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
set(HDF5_${_lang}_FOUND TRUE)
endif()
if(HDF5_FIND_HL)
@@ -569,8 +569,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
endif()
if( _hdf5_lang_hl_location )
set(HDF5_${_lang}_HL_LIBRARY ${_hdf5_lang_hl_location})
- list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
- set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
+ list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_TARGET}${_suffix})
+ set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_TARGET}${_suffix})
set(HDF5_HL_FOUND TRUE)
endif()
unset(_hdf5_lang_hl_location)