mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 09:19:00 +08:00
[folly] Remove vcpkg_fail_port_install. (#22745)
* [folly] Remove vcpkg_fail_port_install. vcpkg.json was missing the uwp skip but otherwise agreed. There is no ci.baseline.txt impact because: Error: libevent[core] is only supported on '!uwp' In support of https://github.com/microsoft/vcpkg/pull/21502 * Give up trying to prove that the support expression is correct and just follow what portfile.cmake says. * Fix brain fart @JackBoosY found.
This commit is contained in:
parent
b18fc99b28
commit
6e8f8e3a83
@ -1,9 +1,3 @@
|
||||
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)
|
||||
|
||||
# Required to run build/generate_escape_tables.py et al.
|
||||
|
@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "folly",
|
||||
"version-string": "2021.06.14.00",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"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 | (arm64 & !windows)",
|
||||
"supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))",
|
||||
"dependencies": [
|
||||
"boost-chrono",
|
||||
"boost-context",
|
||||
|
@ -2230,7 +2230,7 @@
|
||||
},
|
||||
"folly": {
|
||||
"baseline": "2021.06.14.00",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"font-chef": {
|
||||
"baseline": "1.1.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c31f74183da180ea71937f3c5b6ac0c8a3619b1b",
|
||||
"version-string": "2021.06.14.00",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47",
|
||||
"version-string": "2021.06.14.00",
|
||||
|
Loading…
Reference in New Issue
Block a user