Skip to content

[tiff] Remove vcpkg_fail_port_install. #22766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil-ms merged 1 commit into from
Jan 24, 2022
Merged

[tiff] Remove vcpkg_fail_port_install. #22766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ports/tiff/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ if(VCPKG_TARGET_IS_UWP)
list(APPEND EXTRA_OPTIONS "-DUSE_WIN32_FILEIO=OFF") # On UWP we use the unix I/O api.
endif()

if("cxx" IN_LIST FEATURES)
vcpkg_fail_port_install(
MESSAGE "Feature 'cxx' is not supported on ${VCPKG_TARGET_ARCHITECTURE}."
ON_ARCH arm arm64
)
endif()

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
cxx cxx
Expand Down
5 changes: 3 additions & 2 deletions ports/tiff/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tiff",
"version": "4.3.0",
"port-version": 4,
"port-version": 5,
"description": "A library that supports the manipulation of TIFF image files",
"homepage": "https://libtiff.gitlab.io/libtiff/",
"dependencies": [
Expand All @@ -17,7 +17,8 @@
],
"features": {
"cxx": {
"description": "Build C++ libtiffxx library"
"description": "Build C++ libtiffxx library",
"supports": "!arm"
},
"jpeg": {
"description": "Support JPEG compression in TIFF image files",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6814,7 +6814,7 @@
},
"tiff": {
"baseline": "4.3.0",
"port-version": 4
"port-version": 5
},
"tinkerforge": {
"baseline": "2.1.25",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tiff.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "29af46222dc88425d734288253d807f1a9b96419",
"version": "4.3.0",
"port-version": 5
},
{
"git-tree": "b416d3e62450590e19a43f04b573c65555f3bc62",
"version": "4.3.0",
Expand Down