aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2020-10-09 03:30:58 +0800
committerGitHub <noreply@github.com>2020-10-08 12:30:58 -0700
commit7bb217d9898fb13fa032731aef635ec66c7625b6 (patch)
tree4e1b04cf61d8a2ce0bfcc2ad84257000eb92f1cd
parentfdcfd8e5d79a9551249b60251edb81733fd227db (diff)
downloadvcpkg-7bb217d9898fb13fa032731aef635ec66c7625b6.tar.gz
vcpkg-7bb217d9898fb13fa032731aef635ec66c7625b6.zip
[7zip] Add supports field (#13821)
-rw-r--r--ports/7zip/CONTROL4
-rw-r--r--ports/7zip/portfile.cmake6
-rw-r--r--scripts/ci.baseline.txt5
3 files changed, 5 insertions, 10 deletions
diff --git a/ports/7zip/CONTROL b/ports/7zip/CONTROL
index 73150ef44..b37fa18d1 100644
--- a/ports/7zip/CONTROL
+++ b/ports/7zip/CONTROL
@@ -1,4 +1,6 @@
Source: 7zip
Version: 19.00
-Port-Version: 1
+Port-Version: 2
+Homepage: https://www.7-zip.org
Description: Library for archiving file with a high compression ratio.
+Supports: !(linux|osx|arm|uwp)
diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
index 83515438c..bffb9b4df 100644
--- a/ports/7zip/portfile.cmake
+++ b/ports/7zip/portfile.cmake
@@ -1,4 +1,4 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx")
set(7ZIP_VERSION 19.00)
vcpkg_download_distfile(ARCHIVE
@@ -27,8 +27,6 @@ vcpkg_copy_pdbs()
file(
INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/7zip
+ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
RENAME copyright
)
-
-vcpkg_test_cmake(PACKAGE_NAME 7zip)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index ed7c695d1..891f2d97b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -36,11 +36,6 @@
3fd:x64-windows=fail
3fd:x64-windows-static=fail
3fd:x86-windows=fail
-7zip:arm64-windows=fail
-7zip:arm-uwp=fail
-7zip:x64-linux=fail
-7zip:x64-osx=fail
-7zip:x64-uwp=fail
activemq-cpp:x64-linux=fail
activemq-cpp:x64-osx=fail
akali:x64-uwp=fail