mirror of https://github.com/microsoft/vcpkg.git
[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>
This commit is contained in:
parent
7fae7f5923
commit
6a8dea1ace
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -2602,7 +2602,7 @@
|
|||
},
|
||||
"icu": {
|
||||
"baseline": "69.1",
|
||||
"port-version": 13
|
||||
"port-version": 14
|
||||
},
|
||||
"ideviceinstaller": {
|
||||
"baseline": "1.1.2.23-1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2632dd55c20f6830027ae1e167524817b1a9d7ec",
|
||||
"version": "69.1",
|
||||
"port-version": 14
|
||||
},
|
||||
{
|
||||
"git-tree": "d8c36cdfe8059aadefd80b2d5800a5d9f3494cd6",
|
||||
"version": "69.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue