diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-04-20 21:04:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-04-20 21:04:33 (GMT) |
| commit | 0b0d31e5201e76eae1cb0d219d68934d8c0942b7 (patch) | |
| tree | ca5e2ab079ab62d03734d1ec238be3bad5ae4194 /config | |
| parent | 50db0eed22ef60b4a79b10deb0562662892c7891 (diff) | |
| download | hdf5-0b0d31e5201e76eae1cb0d219d68934d8c0942b7.zip hdf5-0b0d31e5201e76eae1cb0d219d68934d8c0942b7.tar.gz hdf5-0b0d31e5201e76eae1cb0d219d68934d8c0942b7.tar.bz2 | |
[svn-r26852] Correct component matching
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/hdf5-config.cmake.in | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in index da5304d..667d3e6 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -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}})
\ No newline at end of file |