diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-08-13 22:57:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 13:57:28 -0700 |
| commit | 801f40c6883e40792ed4dc13547dcd9c4c2e2701 (patch) | |
| tree | c4d07b3833fa000208d2d0cf86284182f5cddb84 /ports/libiconv | |
| parent | bdc8687f7cd7e107d2192dc1a60504c84f57c395 (diff) | |
| download | vcpkg-801f40c6883e40792ed4dc13547dcd9c4c2e2701.tar.gz vcpkg-801f40c6883e40792ed4dc13547dcd9c4c2e2701.zip | |
[OpenCV] update to v4.5.3 and to v3.4.15 (#18827)
* [OpenCV] update to v4.5.3 and to v3.4.15
* [OpenCV] update refs
* [libxml2] add missing find_dependency(Iconv)
[libiconv] update cmake wrapper
* [libiconv] fix hints
* [opencv4] do not require cudnn if cuda enabled
* [opencv] update refs
* [OpenCV] increase CI coverage even more
* [vcpkg-ci-opencv] trying to restore x64-uwp ci tests
* restore previous patches to avoid unnecessary modifications
* [OpenCV] fix refs
* [OpenCV] fix CMake Warning related to protobuf dependency
* [OpenCV] fix refs
* [libxml2] fix references
* [libxml2] restore previous cmake wrapper, new one is broken
* [libxml2] fix references
* bump versions
* update refs
* [libxml2] Update the format for vcpkg-cmake-wrapper.cmake
* Update versions/l-/libxml2.json
* [libxml2] update port version
* [libxml2] update refs
* [OpenCV] fix refs
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Diffstat (limited to 'ports/libiconv')
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/vcpkg-cmake-wrapper.cmake | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 6eed4fee3..2e69c031b 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 9 +Port-Version: 10 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake index db39413da..8e25449ae 100644 --- a/ports/libiconv/vcpkg-cmake-wrapper.cmake +++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -2,14 +2,20 @@ include(SelectLibraryConfigurations) _find_package(${ARGS})
if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
- find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
- find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
- find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib)
+ find_path(CHARSET_INCLUDE_DIR NAMES "libcharset.h" HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+ find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug")
+ find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
select_library_configurations(CHARSET)
+ if(NOT TARGET Iconv::Charset)
+ add_library(Iconv::Charset INTERFACE IMPORTED)
+ set_target_properties(Iconv::Charset PROPERTIES
+ INTERFACE_LINK_LIBRARIES "\$<\$<NOT:\$<CONFIG:DEBUG>>:${CHARSET_LIBRARY_RELEASE}>;\$<\$<CONFIG:DEBUG>:${CHARSET_LIBRARY_DEBUG}>"
+ INTERFACE_INCLUDE_DIRECTORIES "${CHARSET_INCLUDE_DIRS}")
+ endif()
if(CHARSET_LIBRARIES)
list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})
if(TARGET Iconv::Iconv)
- target_link_libraries(Iconv::Iconv INTERFACE ${CHARSET_LIBRARIES})
+ set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Charset)
endif()
endif()
endif()
|