From b5a6f7eb63562f7cc553ab84d64d3ee426fc2599 Mon Sep 17 00:00:00 2001 From: codicodi Date: Thu, 1 Dec 2016 15:03:33 +0100 Subject: Fix arch/linkage checks --- ports/icu/portfile.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 376c2878b..a8bdd1d80 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,5 +1,10 @@ -if (NOT TARGET_TRIPLET STREQUAL "x86-windows" AND NOT TARGET_TRIPLET STREQUAL "x64-windows") - message(FATAL_ERROR "Error: Only x64 and x86 desktop builds are supported now.") +if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + message(FATAL_ERROR "Error: ARM and/or UWP builds are currently not supported.") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) -- cgit v1.2.3