diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindHDF5.cmake | 8 | ||||
| -rw-r--r-- | Modules/FindICU.cmake | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 16764e0..6e5a25e 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -439,8 +439,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT) set(HDF5_${_lang}_LIBRARY ${_lang_location} CACHE PATH "HDF5 ${_lang} library" ) mark_as_advanced(HDF5_${_lang}_LIBRARY) - 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(FIND_HL) @@ -449,8 +449,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT) set(HDF5_${_lang}_HL_LIBRARY ${_lang_hl_location} CACHE PATH "HDF5 ${_lang} HL library" ) mark_as_advanced(HDF5_${_lang}_HL_LIBRARY) - 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}_TARGET}${_suffix}) + set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix}) set(HDF5_HL_FOUND True) endif() endif() diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake index 36dd67e..5210f08 100644 --- a/Modules/FindICU.cmake +++ b/Modules/FindICU.cmake @@ -126,6 +126,7 @@ function(_ICU_FIND) # Generic 64-bit and 32-bit directories list(APPEND icu_binary_suffixes "${_bin64}" "bin") list(APPEND icu_library_suffixes "${_lib64}" "lib") + list(APPEND icu_include_suffixes "include") # Find all ICU programs foreach(program ${icu_programs}) |