mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-24 17:51:25 +08:00
[svn-r26852] Correct component matching
This commit is contained in:
parent
50db0eed22
commit
0b0d31e520
@ -105,20 +105,20 @@ endif ()
|
||||
list (REMOVE_DUPLICATES ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
|
||||
foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
|
||||
set (hdf5_comp2)
|
||||
if (${comp} MATCHES "C")
|
||||
if (${comp} STREQUAL "C")
|
||||
set (hdf5_comp "hdf5")
|
||||
elseif (${comp} MATCHES "CXX")
|
||||
elseif (${comp} STREQUAL "CXX")
|
||||
set (hdf5_comp "hdf5_cpp")
|
||||
elseif (${comp} MATCHES "HL")
|
||||
elseif (${comp} STREQUAL "HL")
|
||||
set (hdf5_comp "hdf5_hl")
|
||||
elseif (${comp} MATCHES "CXX_HL")
|
||||
elseif (${comp} STREQUAL "CXX_HL")
|
||||
set (hdf5_comp "hdf5_hl_cpp")
|
||||
elseif (${comp} MATCHES "Tools")
|
||||
elseif (${comp} STREQUAL "Tools")
|
||||
set (hdf5_comp "hdf5_tools")
|
||||
elseif (${comp} MATCHES "Fortran")
|
||||
elseif (${comp} STREQUAL "Fortran")
|
||||
set (hdf5_comp2 "hdf5_f90cstub")
|
||||
set (hdf5_comp "hdf5_fortran")
|
||||
elseif (${comp} MATCHES "Fortran_HL")
|
||||
elseif (${comp} STREQUAL "Fortran_HL")
|
||||
set (hdf5_comp2 "hdf5_hl_f90cstub")
|
||||
set (hdf5_comp "hdf5_hl_fortran")
|
||||
endif ()
|
||||
@ -133,17 +133,15 @@ list (REMOVE_DUPLICATES ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
|
||||
else ()
|
||||
set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 1)
|
||||
string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_LIBRARY COMP_LIBRARY)
|
||||
set (${COMP_LIBRARY} ${${COMP_LIBRARY}} ${hdf5_comp2} ${hdf5_comp})
|
||||
set (${HDF5_PACKAGE_NAME}_LIBRARIES ${${HDF5_PACKAGE_NAME}_LIBRARIES} ${hdf5_comp2} ${hdf5_comp})
|
||||
endif ()
|
||||
else ()
|
||||
set (${HDF5_PACKAGE_NAME}_${comp}_FOUND 1)
|
||||
string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_LIBRARY COMP_LIBRARY)
|
||||
set (${COMP_LIBRARY} ${${COMP_LIBRARY}} ${hdf5_comp})
|
||||
set (${HDF5_PACKAGE_NAME}_LIBRARIES ${${HDF5_PACKAGE_NAME}_LIBRARIES} ${hdf5_comp})
|
||||
endif ()
|
||||
endif ()
|
||||
endforeach ()
|
||||
|
||||
check_required_components(${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
|
||||
|
||||
set (${HDF5_PACKAGE_NAME}_LIBRARIES ${${COMP_LIBRARY}})
|
||||
|
Loading…
x
Reference in New Issue
Block a user