https://bugs.webkit.org/show_bug.cgi?id=176113
Reviewed by Alex Christensen.
.:
* Source/cmake/OptionsWinCairo.cmake:
Source/WebCore:
No new tests. No change in behavior.
* PlatformWinCairo.cmake:
* platform/ImageDecoders.cmake:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221387
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2017-08-30 Don Olmstead <don.olmstead@sony.com>
+
+ [CMake][WinCairo] Use find_package for libpng and libjpeg
+ https://bugs.webkit.org/show_bug.cgi?id=176113
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/OptionsWinCairo.cmake:
+
2017-08-30 Carlos Alberto Lopez Perez <clopez@igalia.com>
[WPE] Enable MEMORY_SAMPLER
+2017-08-30 Don Olmstead <don.olmstead@sony.com>
+
+ [CMake][WinCairo] Use find_package for libpng and libjpeg
+ https://bugs.webkit.org/show_bug.cgi?id=176113
+
+ Reviewed by Alex Christensen.
+
+ No new tests. No change in behavior.
+
+ * PlatformWinCairo.cmake:
+ * platform/ImageDecoders.cmake:
+
2017-08-22 Matt Rajca <mrajca@apple.com>
Opt all Mac clients into document-level media user gesture quirks.
crypt32
iphlpapi
libcurl_imp
- libjpeg
- libpng
rpcrt4
shlwapi
usp10
platform/image-decoders/webp/WEBPImageDecoder.cpp
)
-if (JPEG_FOUND)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${JPEG_INCLUDE_DIR}
- )
- list(APPEND WebCore_LIBRARIES
- ${JPEG_LIBRARIES}
- )
-endif ()
-
-if (PNG_FOUND)
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${PNG_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${PNG_LIBRARIES}
- )
-endif ()
+list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${JPEG_INCLUDE_DIR}
+ ${PNG_INCLUDE_DIRS}
+)
+list(APPEND WebCore_LIBRARIES
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
+)
if (WEBP_FOUND)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
find_package(Cairo 1.14.4 REQUIRED)
find_package(CURL 7.45.0 REQUIRED)
+find_package(JPEG REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
find_package(OpenSSL REQUIRED)
+find_package(PNG REQUIRED)
find_package(Sqlite REQUIRED)
find_package(ZLIB REQUIRED)