From 3f6be88a04c0b850d328d90239d5a33d0d467c62 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 3 Feb 2020 14:05:59 +0100 Subject: [PATCH] removed traces of web_js completly --- ports/libwebp/CONTROL | 2 +- ports/libwebp/portfile.cmake | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index 04f738b5eb..b96114f050 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -54,5 +54,5 @@ Feature: swap16bitcsp Description: Enable byte swap for 16 bit colorspaces. Feature: all -Description: enable all features except for webp_js and swap16bitcsp +Description: enable all features except for swap16bitcsp Build-Depends: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl] (!osx), libwebp[extras] (!osx) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index aa992e9519..d24fd12d12 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -27,7 +27,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS simd WEBP_ENABLE_SIMD cwebp WEBP_BUILD_CWEBP dwebp WEBP_BUILD_DWEBP - webp_js WEBP_BUILD_WEBP_JS swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP unicode WEBP_UNICODE ) @@ -43,10 +42,6 @@ if(VCPKG_TARGET_IS_OSX) endif() endif() -if("webp_js" IN_LIST FEATURES AND "${FEATURES}" MATCHES "(anim|gif2webp|img2webp|extras|info|vwebp|mux|cwebp|dwebp)") - message(FATAL_ERROR "Feature webp_js conflicts with features anim|gif2webp|img2webp|extras|info|vwebp|mux|cwebp|dwebp!") -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA