[libiconv] Fix usage (#23961)

* [libiconv] Fix usage

* version
This commit is contained in:
Thomas1664 2022-04-06 23:02:37 +02:00 committed by GitHub
parent a3dbfe8aa7
commit f387f27f13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 11 deletions

View File

@ -26,15 +26,16 @@ if (NOT VCPKG_TARGET_IS_ANDROID)
list(APPEND OPTIONS --enable-relocatable)
endif()
vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}"
DETERMINE_BUILD_TRIPLET
USE_WRAPPERS
OPTIONS
--enable-extra-encodings
--without-libiconv-prefix
--without-libintl-prefix
${OPTIONS}
)
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
DETERMINE_BUILD_TRIPLET
USE_WRAPPERS
OPTIONS
--enable-extra-encodings
--without-libiconv-prefix
--without-libintl-prefix
${OPTIONS}
)
vcpkg_install_make()
vcpkg_copy_pdbs()
@ -47,4 +48,6 @@ set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files
# Please keep, the default usage is broken
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

4
ports/libiconv/usage Normal file
View File

@ -0,0 +1,4 @@
The package libiconv provides CMake targets:
find_package(Iconv)
target_link_libraries(main PRIVATE Iconv::Iconv)

View File

@ -1,7 +1,7 @@
{
"name": "libiconv",
"version": "1.16",
"port-version": 12,
"port-version": 13,
"description": "GNU Unicode text conversion",
"homepage": "https://www.gnu.org/software/libiconv/"
}

View File

@ -3630,7 +3630,7 @@
},
"libiconv": {
"baseline": "1.16",
"port-version": 12
"port-version": 13
},
"libics": {
"baseline": "1.6.5",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5",
"version": "1.16",
"port-version": 13
},
{
"git-tree": "3942643a4d682982e61b60611394e4315dfc42a1",
"version": "1.16",