Skip to content

Commit 41f668c

Browse files
m-kuhnfwcd
authored andcommitted
[icu] Fix osx release only builds (microsoft#34539)
* [icu] Fix osx release only builds * Use list
1 parent 61be1e7 commit 41f668c

4 files changed

Lines changed: 14 additions & 5 deletions

File tree

ports/icu/portfile.cmake

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layout
3333
list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release)
3434
list(APPEND CONFIGURE_OPTIONS_DEBUG --enable-debug --disable-release)
3535

36-
set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
37-
set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg)
36+
set(CONFIG_TRIPLETS)
37+
list(APPEND CONFIG_TRIPLETS ${TARGET_TRIPLET}-rel)
38+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
39+
list(APPEND CONFIG_TRIPLETS ${TARGET_TRIPLET}-dbg)
40+
endif()
3841

3942
if("tools" IN_LIST FEATURES)
4043
list(APPEND CONFIGURE_OPTIONS --enable-tools)
@@ -89,7 +92,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
8992
endif()
9093

9194
#31680: Fix @rpath in both debug and release build
92-
foreach(CONFIG_TRIPLE IN ITEMS ${DEBUG_TRIPLET} ${RELEASE_TRIPLET})
95+
foreach(CONFIG_TRIPLE IN LISTS CONFIG_TRIPLETS)
9396
# add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc
9497
foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc)
9598
vcpkg_execute_build_process(
@@ -178,7 +181,7 @@ file(REMOVE_RECURSE
178181
"${CURRENT_PACKAGES_DIR}/tools/icu/debug")
179182

180183
# To cross compile, we need some files at specific positions. So lets copy them
181-
file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config/icucross.*")
184+
file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config/icucross.*")
182185
file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config")
183186

184187
file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll")

ports/icu/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "icu",
33
"version": "73.1",
4+
"port-version": 1,
45
"description": "Mature and widely used Unicode and localization library.",
56
"homepage": "https://icu.unicode.org/home",
67
"license": "ICU",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3322,7 +3322,7 @@
33223322
},
33233323
"icu": {
33243324
"baseline": "73.1",
3325-
"port-version": 0
3325+
"port-version": 1
33263326
},
33273327
"ideviceinstaller": {
33283328
"baseline": "2023-07-21",

versions/i-/icu.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "deb5694d7965a264d6eb579df49aff4fe6362c24",
5+
"version": "73.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "acc3cf9137af5fc8fdd3e8607377026cf88f144d",
510
"version": "73.1",

0 commit comments

Comments
 (0)