diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2020-01-14 00:20:46 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2020-01-14 00:20:46 +0100 |
| commit | 2c9613321415ef38450513a8e876db8919690aac (patch) | |
| tree | a1682230da5b3236c8651ef5faa0d0cee4d972d5 | |
| parent | 8d3ac08ca1b496da2cb45fd5a280dbd42f73e763 (diff) | |
| download | vcpkg-2c9613321415ef38450513a8e876db8919690aac.tar.gz vcpkg-2c9613321415ef38450513a8e876db8919690aac.zip | |
deactivate vwebp and extras on osx. (due to CI message)
| -rw-r--r-- | ports/libwebp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libwebp/portfile.cmake | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index 58be94505..23fb15e70 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -58,4 +58,4 @@ Description: Enable byte swap for 16 bit colorspaces. Feature: all Description: enable all features except for webp_js and swap16bitcsp -Build-Depends: libwebp[anim, gif2webp, img2webp, vwebp_sdl, info, mux, extras, nearlossless, simd, cwebp, dwebp]
\ No newline at end of file +Build-Depends: libwebp[anim, gif2webp, img2webp, vwebp_sdl (!osx), info, mux, extras (!osx), nearlossless, simd, cwebp, dwebp]
\ No newline at end of file diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 58c197867..2cdbd9e03 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -33,14 +33,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(VCPKG_TARGET_IS_LINUX) message("WebP currently requires the following library from the system package manager:\n Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev") endif() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(WEBP_BUILD_VWEBP OFF) - set(WEBP_BUILD_EXTRAS OFF) - message("Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP on Mac. It has been disabled together with extras.") +if(VCPKG_TARGET_IS_OSX) + if("vwebp" IN_LIST FEATURES OR "extras" IN_LIST FEATURES) + message(FATAL_ERROR "Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP or extras on Mac!") + endif() endif() vcpkg_configure_cmake( |