aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-01 13:35:21 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-01 13:35:32 -0800
commit55b48e77d1742f807c27cdd6969a39cb54a8f8c2 (patch)
tree4a290348983d165dc7dde9923fde7b8ff5cc0d76
parentd2c1aaddc8b953e28b8fd4a0c17c4982469b290c (diff)
downloadvcpkg-55b48e77d1742f807c27cdd6969a39cb54a8f8c2.tar.gz
vcpkg-55b48e77d1742f807c27cdd6969a39cb54a8f8c2.zip
[freeimage] Link webpmux.
-rw-r--r--ports/freeimage/CONTROL2
-rw-r--r--ports/freeimage/cmake/FindWEBP.cmake12
2 files changed, 7 insertions, 7 deletions
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL
index 9d7c65b6f..6e8de82fc 100644
--- a/ports/freeimage/CONTROL
+++ b/ports/freeimage/CONTROL
@@ -1,4 +1,4 @@
Source: freeimage
-Version: 3.17.0-3
+Version: 3.17.0-4
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr
Description: Support library for graphics image formats
diff --git a/ports/freeimage/cmake/FindWEBP.cmake b/ports/freeimage/cmake/FindWEBP.cmake
index 9b8516e15..b4fefeadc 100644
--- a/ports/freeimage/cmake/FindWEBP.cmake
+++ b/ports/freeimage/cmake/FindWEBP.cmake
@@ -10,17 +10,17 @@ find_path(WEBP_INCLUDE_DIRS
)
mark_as_advanced(WEBP_INCLUDE_DIRS)
-find_library(
- WEBP_LIBRARIES
- NAMES webp
-)
-
find_library(WEBP_LIBRARY_RELEASE NAMES webp PATH_SUFFIXES lib)
find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATH_SUFFIXES lib)
+
+find_library(WEBPMUX_LIBRARY_RELEASE NAMES webpmux PATH_SUFFIXES lib)
+find_library(WEBPMUX_LIBRARY_DEBUG NAMES webpmuxd PATH_SUFFIXES lib)
+
include(SelectLibraryConfigurations)
select_library_configurations(WEBP)
+select_library_configurations(WEBPMUX)
-set(WEBP_LIBRARIES ${WEBP_LIBRARY})
+set(WEBP_LIBRARIES ${WEBPMUX_LIBRARY} ${WEBP_LIBRARY})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES)