mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-12 20:39:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

FindHDF5: Remove unnecessary de-duplication of HDF5_LIBRARIES and friends

Browse Source 
* When both debug and optimized libraries are found, the corresponding
  keywords were getting de-duplicated and breaking.
* CMake's link line generation de-duplicates in many cases anyway.
* Other find modules do not explicitly de-duplicate in general.

Fixes: #21670
This commit is contained in:
Kris Thielemans
2021-01-11 23:12:06 +00:00
committed by Brad King
parent dadb13f546
commit a5fe1712b2
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/FindHDF5.cmake
View File

@@ -206,22 +206,6 @@ else()
set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc) set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc)
endif() endif()
# We may have picked up some duplicates in various lists during the above
# process for the language bindings (both the C and C++ bindings depend on
# libz for example). Remove the duplicates. It appears that the default
# CMake behavior is to remove duplicates from the end of a list. However,
# for link lines, this is incorrect since unresolved symbols are searched
# for down the link line. Therefore, we reverse the list, remove the
# duplicates, and then reverse it again to get the duplicates removed from
# the beginning.
macro(_HDF5_remove_duplicates_from_beginning _list_name)
if(${_list_name})
list(REVERSE ${_list_name})
list(REMOVE_DUPLICATES ${_list_name})
list(REVERSE ${_list_name})
endif()
endmacro()
# Test first if the current compilers automatically wrap HDF5 # Test first if the current compilers automatically wrap HDF5
function(_HDF5_test_regular_compiler_C success version is_parallel) function(_HDF5_test_regular_compiler_C success version is_parallel)
set(scratch_directory set(scratch_directory
@@ -726,8 +710,6 @@ if(NOT HDF5_FOUND)
set(HDF5_${_lang}_FOUND TRUE) set(HDF5_${_lang}_FOUND TRUE)
list(REMOVE_DUPLICATES HDF5_${_lang}_DEFINITIONS) list(REMOVE_DUPLICATES HDF5_${_lang}_DEFINITIONS)
list(REMOVE_DUPLICATES HDF5_${_lang}_INCLUDE_DIRS) list(REMOVE_DUPLICATES HDF5_${_lang}_INCLUDE_DIRS)
_HDF5_remove_duplicates_from_beginning(HDF5_${_lang}_LIBRARIES)
_HDF5_remove_duplicates_from_beginning(HDF5_${_lang}_HL_LIBRARIES)
else() else()
set(_HDF5_NEED_TO_SEARCH TRUE) set(_HDF5_NEED_TO_SEARCH TRUE)
endif() endif()
@@ -782,8 +764,6 @@ elseif(NOT HDF5_FOUND AND NOT _HDF5_NEED_TO_SEARCH)
endforeach() endforeach()
list(REMOVE_DUPLICATES HDF5_DEFINITIONS) list(REMOVE_DUPLICATES HDF5_DEFINITIONS)
list(REMOVE_DUPLICATES HDF5_INCLUDE_DIRS) list(REMOVE_DUPLICATES HDF5_INCLUDE_DIRS)
_HDF5_remove_duplicates_from_beginning(HDF5_LIBRARIES)
_HDF5_remove_duplicates_from_beginning(HDF5_HL_LIBRARIES)
set(HDF5_FOUND TRUE) set(HDF5_FOUND TRUE)
set(HDF5_REQUIRED_VARS HDF5_LIBRARIES) set(HDF5_REQUIRED_VARS HDF5_LIBRARIES)
if(HDF5_FIND_HL) if(HDF5_FIND_HL)
@@ -925,8 +905,6 @@ if( NOT HDF5_FOUND )
list(REMOVE_DUPLICATES HDF5_DEFINITIONS) list(REMOVE_DUPLICATES HDF5_DEFINITIONS)
list(REMOVE_DUPLICATES HDF5_INCLUDE_DIRS) list(REMOVE_DUPLICATES HDF5_INCLUDE_DIRS)
_HDF5_remove_duplicates_from_beginning(HDF5_LIBRARIES)
_HDF5_remove_duplicates_from_beginning(HDF5_HL_LIBRARIES)
# If the HDF5 include directory was found, open H5pubconf.h to determine if # If the HDF5 include directory was found, open H5pubconf.h to determine if
# HDF5 was compiled with parallel IO support # HDF5 was compiled with parallel IO support