diff options
| author | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-04-13 09:48:50 +0700 |
|---|---|---|
| committer | Wimok Nupphiboon <wimok.mok@gmail.com> | 2018-04-13 09:48:50 +0700 |
| commit | 00cdc0b10a089c6c3763f8e3c7847efac909e3fd (patch) | |
| tree | dbe3d517060d68a06e7b0ac58104b0d7ea8547b6 /ports/libiconv | |
| parent | 30b56c86148babd61eb6c7c2807421bdcd8d3c13 (diff) | |
| parent | dc207a2c891fe6deb2710ccde0abf48078f64fcd (diff) | |
| download | vcpkg-00cdc0b10a089c6c3763f8e3c7847efac909e3fd.tar.gz vcpkg-00cdc0b10a089c6c3763f8e3c7847efac909e3fd.zip | |
Merge remote-tracking branch 'origin/master'
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/unofficial-iconv-config.cmake | 2 | ||||
| -rw-r--r-- | ports/libiconv/vcpkg-iconv-config.cmake | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 8bb9625b9..37c1a0f0d 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,3 +1,3 @@ Source: libiconv -Version: 1.15-2 +Version: 1.15-3 Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index bded180db..5cc48da91 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,7 +1,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/libiconv) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv) return() endif() diff --git a/ports/libiconv/unofficial-iconv-config.cmake b/ports/libiconv/unofficial-iconv-config.cmake new file mode 100644 index 000000000..e272ce09e --- /dev/null +++ b/ports/libiconv/unofficial-iconv-config.cmake @@ -0,0 +1,2 @@ +add_library(unofficial::iconv::libcharset UNKNOWN IMPORTED)
+add_library(unofficial::iconv::libiconv UNKNOWN IMPORTED)
diff --git a/ports/libiconv/vcpkg-iconv-config.cmake b/ports/libiconv/vcpkg-iconv-config.cmake deleted file mode 100644 index 4befd4d15..000000000 --- a/ports/libiconv/vcpkg-iconv-config.cmake +++ /dev/null @@ -1,2 +0,0 @@ -add_library(unofficial::vcpkg::libcharset UNKNOWN IMPORTED)
-add_library(unofficial::vcpkg::libiconv UNKNOWN IMPORTED)
|