3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[libiconv] Updated typo in iconv share files location (#15771)

Browse Source 
* Updated typo in iconv share files location

CMake Error at ports/libiconv/portfile.cmake:4 (file):
  file COPY cannot copy file
  "/root/dev/ExternalLibraries/vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake"
  to
  "/root/dev/ExternalLibraries/vcpkg/packages/libiconv_x64-linux/share/iconv/vcpkg-cmake-wrapper.cmake":
  Success.
Call Stack (most recent call first):
  scripts/ports.cmake:136 (include)

* [libiconv] Bump version

* update baseline

* Update ports/libiconv/portfile.cmake

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* update baseline

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
This commit is contained in:
Ludek Vodicka 2021-01-25 09:15:40 +01:00 committed by GitHub
parent b7c8a3097d
commit c997738435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libiconv/CONTROL
View File

@ -1,5 +1,5 @@
Source: libiconv
Version: 1.16
Port-Version: 6
Port-Version: 7
Homepage: https://www.gnu.org/software/libiconv/
Description: GNU Unicode text conversion

4
ports/libiconv/portfile.cmake
View File

@ -1,6 +1,6 @@
if(NOT VCPKG_TARGET_IS_WINDOWS)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/Iconv)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv)
return()
endif()
@ -42,4 +42,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURR
file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)

2
versions/baseline.json
View File

@ -3010,7 +3010,7 @@
},
"libiconv": {
"baseline": "1.16",
"port-version": 6
"port-version": 7
},
"libics": {
"baseline": "1.6.4",

5
versions/l-/libiconv.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d",
"version-string": "1.16",
"port-version": 7
},
{
"git-tree": "b052109a8f7de3bcaf5d81b92952cbe9218dea6a",
"version-string": "1.16",