aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorautoantwort <41973254+autoantwort@users.noreply.github.com>2021-09-04 02:00:37 +0200
committerGitHub <noreply@github.com>2021-09-03 17:00:37 -0700
commit01198e2497d3b78ed399409fe70631126028687c (patch)
tree1f24dbdab4795da38f7eb3a4574347dc8774fa40 /ports
parent9414ca11a93e188d061986f6fe6eb84c94938ed0 (diff)
downloadvcpkg-01198e2497d3b78ed399409fe70631126028687c.tar.gz
vcpkg-01198e2497d3b78ed399409fe70631126028687c.zip
[folly] also support arm64 (#19738)
Diffstat (limited to 'ports')
-rw-r--r--ports/folly/portfile.cmake6
-rw-r--r--ports/folly/vcpkg.json3
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index a2e8a436e..21df520bf 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -1,5 +1,7 @@
-if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
- message(FATAL_ERROR "Folly only supports the x64 architecture.")
+if (VCPKG_TARGET_IS_WINDOWS)
+ vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64")
+else()
+ vcpkg_fail_port_install(ON_ARCH "x86" "arm")
endif()
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
index e7762e6cf..453e08e9c 100644
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@@ -1,9 +1,10 @@
{
"name": "folly",
"version-string": "2021.06.14.00",
+ "port-version": 1,
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly",
- "supports": "x64",
+ "supports": "x64 | (arm64 & !windows)",
"dependencies": [
"boost-chrono",
"boost-context",