[CMake] Use find_package for zlib

https://bugs.webkit.org/show_bug.cgi?id=176075

Reviewed by Alex Christensen.

.:

* Source/cmake/OptionsAppleWin.cmake:
* Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

No new tests. No change in behavior.

* CMakeLists.txt:
* PlatformAppleWin.cmake:
* PlatformMac.cmake:
* PlatformWinCairo.cmake:

Source/WebKitLegacy:

* PlatformWin.cmake:

Tools:

* TestWebKitAPI/PlatformWin.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221340 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d61d326..d4ee15d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2017-08-29  Don Olmstead  <don.olmstead@sony.com>
 
+        [CMake] Use find_package for zlib
+        https://bugs.webkit.org/show_bug.cgi?id=176075
+
+        Reviewed by Alex Christensen.
+
+        * Source/cmake/OptionsAppleWin.cmake:
+        * Source/cmake/OptionsWinCairo.cmake:
+
+2017-08-29  Don Olmstead  <don.olmstead@sony.com>
+
         [CMake] Use find_package for libxml2 and libxstl
         https://bugs.webkit.org/show_bug.cgi?id=176042
 

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 9284978..c2458bd 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -135,6 +135,7 @@ set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
     ${SQLITE_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIRS}
 )
 
 set(WebCore_IDL_INCLUDES
@@ -3161,6 +3162,7 @@ set(WebCore_LIBRARIES
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
     ${SQLITE_LIBRARIES}
+    ${ZLIB_LIBRARIES}
     JavaScriptCore${DEBUG_SUFFIX}
     PAL${DEBUG_SUFFIX}
 )

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f58df45..dab86a5 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2017-08-29  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Use find_package for zlib
+        https://bugs.webkit.org/show_bug.cgi?id=176075
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in behavior.
+
+        * CMakeLists.txt:
+        * PlatformAppleWin.cmake:
+        * PlatformMac.cmake:
+        * PlatformWinCairo.cmake:
+
 2017-08-29  Devin Rousso  <webkit@devinrousso.com>
 
         CallTracingCallback should ignore `readonly attribute`

diff --git a/Source/WebCore/PlatformAppleWin.cmake b/Source/WebCore/PlatformAppleWin.cmake
index a1111ff..b7955b8 100644 (file)
--- a/Source/WebCore/PlatformAppleWin.cmake
+++ b/Source/WebCore/PlatformAppleWin.cmake
@@ -3,7 +3,6 @@ add_definitions(-DQUARTZCORE_DLL -DDISABLE_COREIMAGE -DDISABLE_FRONTEND -DDISABL
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBKIT_LIBRARIES_DIR}/include"
-    "${WEBKIT_LIBRARIES_DIR}/include/zlib"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/platform/graphics/avfoundation"
     "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"

diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
index d600c2b..55008e6 100644 (file)
--- a/Source/WebCore/PlatformMac.cmake
+++ b/Source/WebCore/PlatformMac.cmake
@@ -47,7 +47,6 @@ list(APPEND WebCore_LIBRARIES
     ${SYSTEMCONFIGURATION_LIBRARY}
     ${WEBKITSYSTEMINTERFACE_LIBRARY}
     ${XML2_LIBRARY}
-    ${ZLIB_LIBRARIES}
 )
 
 add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)

diff --git a/Source/WebCore/PlatformWinCairo.cmake b/Source/WebCore/PlatformWinCairo.cmake
index a5bd9ca..e26ca1d 100644 (file)
--- a/Source/WebCore/PlatformWinCairo.cmake
+++ b/Source/WebCore/PlatformWinCairo.cmake
@@ -7,7 +7,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
     "${DirectX_INCLUDE_DIRS}"
     "${WEBKIT_LIBRARIES_DIR}/include"
-    "${WEBKIT_LIBRARIES_DIR}/include/zlib"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/platform/cf"
 )
@@ -52,7 +51,6 @@ list(APPEND WebCore_LIBRARIES
     version
     winmm
     ws2_32
-    zdll
 )
 
 list(APPEND WebCoreTestSupport_LIBRARIES

diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
index 38d9167..50b6929 100644 (file)
--- a/Source/WebKitLegacy/ChangeLog
+++ b/Source/WebKitLegacy/ChangeLog
@@ -1,5 +1,14 @@
 2017-08-29  Don Olmstead  <don.olmstead@sony.com>
 
+        [CMake] Use find_package for zlib
+        https://bugs.webkit.org/show_bug.cgi?id=176075
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
+2017-08-29  Don Olmstead  <don.olmstead@sony.com>
+
         [CMake] Use find_package for libxml2 and libxstl
         https://bugs.webkit.org/show_bug.cgi?id=176042
 

diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
index eb3becc..9c1f1a8 100644 (file)
--- a/Source/WebKitLegacy/PlatformWin.cmake
+++ b/Source/WebKitLegacy/PlatformWin.cmake
@@ -29,7 +29,6 @@ else ()
         PRIVATE libdispatch${DEBUG_SUFFIX}
         PRIVATE libicuin${DEBUG_SUFFIX}
         PRIVATE libicuuc${DEBUG_SUFFIX}
-        PRIVATE zdll${DEBUG_SUFFIX}
     )
 endif ()
 

diff --git a/Source/cmake/OptionsAppleWin.cmake b/Source/cmake/OptionsAppleWin.cmake
index 0e25154..d315489 100644 (file)
--- a/Source/cmake/OptionsAppleWin.cmake
+++ b/Source/cmake/OptionsAppleWin.cmake
@@ -9,6 +9,8 @@ set(USE_ICU_UNICODE 1)
 set(LIBXML2_LIBRARIES libxml2${DEBUG_SUFFIX})
 set(LIBXSLT_LIBRARIES libxslt${DEBUG_SUFFIX})
 set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
+set(ZLIB_INCLUDE_DIRS "${WEBKIT_LIBRARIES_DIR}/include/zlib")
+set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})
 
 # Uncomment the following line to try the Direct2D backend.
 # set(USE_DIRECT2D 1)

diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
index 6363f64..04e3350 100644 (file)
--- a/Source/cmake/OptionsWinCairo.cmake
+++ b/Source/cmake/OptionsWinCairo.cmake
@@ -7,6 +7,7 @@ find_package(CURL 7.45.0 REQUIRED)
 find_package(LibXml2 2.8.0 REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(Sqlite REQUIRED)
+find_package(ZLIB REQUIRED)
 
 if (ENABLE_XSLT)
     find_package(LibXslt 1.1.7 REQUIRED)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d1f7f01..feb49d6 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-29  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Use find_package for zlib
+        https://bugs.webkit.org/show_bug.cgi?id=176075
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/PlatformWin.cmake:
+
 2017-08-29  Brent Fulgham  <bfulgham@apple.com>
 
         ResourceLoadStatistics logic does not understand custom WebsiteData stores

diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
index dbcfccd..f203950 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformWin.cmake
+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
@@ -96,7 +96,6 @@ else ()
         libexslt${DEBUG_SUFFIX}
         libicuin${DEBUG_SUFFIX}
         libicuuc${DEBUG_SUFFIX}
-        zdll${DEBUG_SUFFIX}
     )
 endif ()