aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2016-12-01 15:03:33 +0100
committerGitHub <noreply@github.com>2016-12-01 15:03:33 +0100
commitb5a6f7eb63562f7cc553ab84d64d3ee426fc2599 (patch)
treeac676fd8b10ee67fd12e495b31978eadc40c9991
parent76e1ee2cfc6c8fab2c1dd1964c6ec6aea66540c3 (diff)
downloadvcpkg-b5a6f7eb63562f7cc553ab84d64d3ee426fc2599.tar.gz
vcpkg-b5a6f7eb63562f7cc553ab84d64d3ee426fc2599.zip
Fix arch/linkage checks
-rw-r--r--ports/icu/portfile.cmake9
1 files 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)