From 07bc0893aad2ea39c079e5954cf458ced3ad8f56 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 24 Dec 2023 09:58:11 +0100 Subject: [PATCH 1/2] [icu] Collect logs [skip actions] --- ports/icu/portfile.cmake | 4 ++++ scripts/azure-pipelines/azure-pipelines.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 0beaa236228593..07aa3aa7724e1a 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -144,3 +144,7 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRE file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +if(VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR STOP) +endif() \ No newline at end of file diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 1a826aa5d5ce0f..f47b40aea3d91f 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -16,7 +16,7 @@ parameters: - name: tripletPattern displayName: 'Enable triplets which contain this substring' type: string - default: '-' + default: 'x64-uwp' jobs: - template: windows/azure-pipelines.yml From 6a46b05b4dd3b8cb95976c776a8fcf76cc1749a4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 24 Dec 2023 14:02:06 +0100 Subject: [PATCH 2/2] WIP [skip actions] --- ports/icu/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 07aa3aa7724e1a..8924fb40d4731c 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -36,6 +36,7 @@ elseif(VCPKG_TARGET_IS_UWP) vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras ac_cv_func_tzset=no ac_cv_func__tzset=no) string(APPEND VCPKG_C_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1") string(APPEND VCPKG_CXX_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1") + vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--windows-uwp-build -O ../data/icupkg.inc") elseif(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_list(APPEND CONFIGURE_OPTIONS --enable-rpath) if(DEFINED CMAKE_INSTALL_NAME_DIR)