@@ -33,8 +33,11 @@ list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layout
3333list (APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release)
3434list (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
3942if ("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.*" )
182185file (INSTALL ${CROSS_COMPILE_DEFS} DESTINATION "${CURRENT_PACKAGES_DIR} /tools/${PORT} /config" )
183186
184187file (GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR} /lib/*icu*${ICU_VERSION_MAJOR} .dll" )
0 commit comments