diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-09-08 06:19:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 15:19:28 -0700 |
| commit | 6a8dea1ace99554907a73f85dedc166db6d4be3b (patch) | |
| tree | 80e1fcb599e78ef12597e06b6fe6071dc9907ec4 | |
| parent | 7fae7f5923c706568710aadfcbe8aa4799478a5f (diff) | |
| download | vcpkg-6a8dea1ace99554907a73f85dedc166db6d4be3b.tar.gz vcpkg-6a8dea1ace99554907a73f85dedc166db6d4be3b.zip | |
[icu] Fix tool path (#19726)
* [icu] Fix tool path
* Update the baseline version
* Apply the review suggestions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/icu/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/icu/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/i-/icu.json | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index bd67c0711..9731bf5b4 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -35,7 +35,10 @@ set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) if(NOT "${TARGET_TRIPLET}" STREQUAL "${HOST_TRIPLET}") # cross compiling - list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}/tools/${PORT}") + set(TOOL_PATH "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") + # convert to unix path + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" _VCPKG_TOOL_PATH "${TOOL_PATH}") + list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_TOOL_PATH}") endif() vcpkg_configure_make( diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 4473713fa..c1e80e530 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 13, + "port-version": 14, "description": "Mature and widely used Unicode and localization library.", "homepage": "http://icu-project.org/apiref/icu4c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 37380854f..5035b32a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2602,7 +2602,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 13 + "port-version": 14 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index cd747442b..bac44faa4 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2632dd55c20f6830027ae1e167524817b1a9d7ec", + "version": "69.1", + "port-version": 14 + }, + { "git-tree": "d8c36cdfe8059aadefd80b2d5800a5d9f3494cd6", "version": "69.1", "port-version": 13 |