[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:

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

diff --git a/ChangeLog b/ChangeLog
index eec2954..2d9f7aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 39413f1..3c88170 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+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.

diff --git a/Source/WebCore/PlatformWinCairo.cmake b/Source/WebCore/PlatformWinCairo.cmake
index e26ca1d..3fdae44 100644 (file)
--- a/Source/WebCore/PlatformWinCairo.cmake
+++ b/Source/WebCore/PlatformWinCairo.cmake
@@ -43,8 +43,6 @@ list(APPEND WebCore_LIBRARIES
     crypt32
     iphlpapi
     libcurl_imp
-    libjpeg
-    libpng
     rpcrt4
     shlwapi
     usp10

diff --git a/Source/WebCore/platform/ImageDecoders.cmake b/Source/WebCore/platform/ImageDecoders.cmake
index c3ee94c..928b12f 100644 (file)
--- a/Source/WebCore/platform/ImageDecoders.cmake
+++ b/Source/WebCore/platform/ImageDecoders.cmake
@@ -26,23 +26,14 @@ list(APPEND WebCore_SOURCES
     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

diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
index 04e3350..b27dba4 100644 (file)
--- a/Source/cmake/OptionsWinCairo.cmake
+++ b/Source/cmake/OptionsWinCairo.cmake
@@ -4,8 +4,10 @@ include(OptionsWin)
 
 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)