diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-02 08:55:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 17:55:23 -0700 |
| commit | 5a80a8e9dd4d18e1491f57cf0d1f03ee8016acfd (patch) | |
| tree | 358449a14826543a2fa9ca6ace38df0d4cd7a91d /ports/libiconv | |
| parent | c967db5c7048ea8a05ca33482ea1797d53568eca (diff) | |
| download | vcpkg-5a80a8e9dd4d18e1491f57cf0d1f03ee8016acfd.tar.gz vcpkg-5a80a8e9dd4d18e1491f57cf0d1f03ee8016acfd.zip | |
[vcpkg-baseline][zxing-cpp] Fix build failure (#11586)
* [zxing-cpp] Fix build failure
* [libiconv] Add vcpkg-cmake-wrapper to find libcharset
* [zxing-cpp] Use FindIconv and wrapper to find libiconv, add features
* [libiconv] Add include code to wrapper
Diffstat (limited to 'ports/libiconv')
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/libiconv/vcpkg-cmake-wrapper.cmake | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 098a30bcc..acff1a893 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,4 +1,4 @@ Source: libiconv -Version: 1.16-2 +Version: 1.16-3 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 5f184079f..b36c995b6 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -37,6 +37,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-iconv TARGET_PATH share/u vcpkg_copy_pdbs() +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/Iconv) + file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..472dd8082 --- /dev/null +++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +include(SelectLibraryConfigurations)
+
+_find_package(${ARGS})
+if(Iconv_FOUND)
+ 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)
+ select_library_configurations(CHARSET)
+ list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})
+endif()
|