Skip to content

[icu] Add tools, fix building for ios #29196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 3 commits into from
Jan 27, 2023
Merged

[icu] Add tools, fix building for ios #29196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11590d5
[icu] Add tools, fix building for ios
m-kuhn Jan 26, 2023
b6fae33
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jan 26, 2023
355d6c1
Make qt5-base depend on icu[tools]
m-kuhn Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ports/icu/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ list(APPEND CONFIGURE_OPTIONS_DEBUG --enable-debug --disable-release)
set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg)

if("tools" IN_LIST FEATURES)
list(APPEND CONFIGURE_OPTIONS --enable-tools)
else()
list(APPEND CONFIGURE_OPTIONS --disable-tools)
endif()
if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_IS_MINGW AND NOT HOST_TRIPLET MATCHES "mingw")
# Assuming no cross compiling because the host (windows) pkgdata tool doesn't
# use the '/' path separator when creating compiler commands for mingw bash.
Expand Down
13 changes: 11 additions & 2 deletions ports/icu/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
{
"name": "icu",
"version": "72.1",
"port-version": 1,
"description": "Mature and widely used Unicode and localization library.",
"homepage": "https://icu.unicode.org/home",
"license": "ICU",
"supports": "!uwp",
"dependencies": [
{
"name": "icu",
"host": true
"host": true,
"features": [
"tools"
]
}
]
],
"features": {
"tools": {
"description": "Build tools"
}
}
}
4 changes: 4 additions & 0 deletions ports/qt5-base/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.8",
"port-version": 1,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,
Expand All @@ -15,6 +16,9 @@
"harfbuzz",
{
"name": "icu",
"features": [
"tools"
],
"platform": "!uwp"
},
"libjpeg-turbo",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3022,7 +3022,7 @@
},
"icu": {
"baseline": "72.1",
"port-version": 0
"port-version": 1
},
"ideviceinstaller": {
"baseline": "1.1.2.23",
Expand Down Expand Up @@ -6206,7 +6206,7 @@
},
"qt5-base": {
"baseline": "5.15.8",
"port-version": 0
"port-version": 1
},
"qt5-canvas3d": {
"baseline": "0",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2a4109603660116f3cb7477c234d3f0275124738",
"version": "72.1",
"port-version": 1
},
{
"git-tree": "ca8792e25fbaf4f4d507eef05e2235b0449ed155",
"version": "72.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt5-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ca5efe99e5f582864670520199ec5da387ceb80",
"version": "5.15.8",
"port-version": 1
},
{
"git-tree": "9bc09074d246485cea02dc5ba92ffcbae8f28cad",
"version": "5.15.8",
Expand Down