[CMake] Use find_package for libxml2 and libxstl

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

Reviewed by Konstantin Tokarev.

.:

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

Source/WebCore:

No new tests. No change in behavior.

* CMakeLists.txt:
* PlatformGTK.cmake:
* PlatformWPE.cmake:
* PlatformWinCairo.cmake:

Source/WebKitLegacy:

* PlatformWin.cmake:

Tools:

* TestWebKitAPI/PlatformWin.cmake:

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

diff --git a/ChangeLog b/ChangeLog
index 33cef49..d61d326 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
+
+        Reviewed by Konstantin Tokarev.
+
+        * Source/cmake/OptionsAppleWin.cmake:
+        * Source/cmake/OptionsWinCairo.cmake:
+
 2017-08-24  Tomas Popela  <tpopela@redhat.com>
 
         Bump trunk version to be 2.19.1

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 6f67c47..f5f1858 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -132,6 +132,8 @@ set(WebCore_INCLUDE_DIRECTORIES
 
 set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${ICU_INCLUDE_DIRS}
+    ${LIBXML2_INCLUDE_DIR}
+    ${LIBXSLT_INCLUDE_DIR}
     ${SQLITE_INCLUDE_DIRS}
 )
 
@@ -3155,6 +3157,8 @@ set(WebCore_PLUG_INS_RESOURCES
 
 set(WebCore_LIBRARIES
     ${ICU_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${LIBXSLT_LIBRARIES}
     ${SQLITE_LIBRARIES}
     JavaScriptCore${DEBUG_SUFFIX}
     PAL${DEBUG_SUFFIX}

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8180b5e..c7c5744 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 libxml2 and libxstl
+        https://bugs.webkit.org/show_bug.cgi?id=176042
+
+        Reviewed by Konstantin Tokarev.
+
+        No new tests. No change in behavior.
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWinCairo.cmake:
+
 2017-08-29  Daniel Bates  <dabates@apple.com>
 
         CacheQueryOptions::isolatedCopy() copies the cache name twice

diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
index b2bd7fe..3da87d8 100644 (file)
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
@@ -210,8 +210,6 @@ list(APPEND WebCore_LIBRARIES
     ${LIBSECRET_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
     ${LIBTASN1_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${LIBXSLT_LIBRARIES}
     ${HYPHEN_LIBRARIES}
     ${X11_X11_LIB}
     ${X11_Xcomposite_LIB}
@@ -233,8 +231,6 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${LIBSECRET_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}
     ${LIBTASN1_INCLUDE_DIRS}
-    ${LIBXML2_INCLUDE_DIR}
-    ${LIBXSLT_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIRS}
 )
 

diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
index 35f5439..9662449 100644 (file)
--- a/Source/WebCore/PlatformWPE.cmake
+++ b/Source/WebCore/PlatformWPE.cmake
@@ -172,8 +172,6 @@ list(APPEND WebCore_LIBRARIES
     ${ICU_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
     ${LIBTASN1_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${LIBXSLT_LIBRARIES}
     ${WPE_LIBRARIES}
 )
 
@@ -185,8 +183,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${ICU_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}
     ${LIBTASN1_INCLUDE_DIRS}
-    ${LIBXML2_INCLUDE_DIR}
-    ${LIBXSLT_INCLUDE_DIR}
     ${WPE_INCLUDE_DIRS}
 )
 

diff --git a/Source/WebCore/PlatformWinCairo.cmake b/Source/WebCore/PlatformWinCairo.cmake
index c7f7aeb..a5bd9ca 100644 (file)
--- a/Source/WebCore/PlatformWinCairo.cmake
+++ b/Source/WebCore/PlatformWinCairo.cmake
@@ -46,8 +46,6 @@ list(APPEND WebCore_LIBRARIES
     libcurl_imp
     libjpeg
     libpng
-    libxml2
-    libxslt
     rpcrt4
     shlwapi
     usp10

diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
index 9106fd1..38d9167 100644 (file)
--- a/Source/WebKitLegacy/ChangeLog
+++ b/Source/WebKitLegacy/ChangeLog
@@ -1,3 +1,12 @@
+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
+
+        Reviewed by Konstantin Tokarev.
+
+        * PlatformWin.cmake:
+
 2017-08-24  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Use find_package for SQLite

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

diff --git a/Source/cmake/OptionsAppleWin.cmake b/Source/cmake/OptionsAppleWin.cmake
index 0268aeb..0e25154 100644 (file)
--- a/Source/cmake/OptionsAppleWin.cmake
+++ b/Source/cmake/OptionsAppleWin.cmake
@@ -6,6 +6,8 @@ set(USE_CFURLCONNECTION 1)
 set(USE_ICU_UNICODE 1)
 
 # Libraries where find_package does not work
+set(LIBXML2_LIBRARIES libxml2${DEBUG_SUFFIX})
+set(LIBXSLT_LIBRARIES libxslt${DEBUG_SUFFIX})
 set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
 
 # Uncomment the following line to try the Direct2D backend.

diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
index a6be327..6363f64 100644 (file)
--- a/Source/cmake/OptionsWinCairo.cmake
+++ b/Source/cmake/OptionsWinCairo.cmake
@@ -4,9 +4,14 @@ include(OptionsWin)
 
 find_package(Cairo 1.14.4 REQUIRED)
 find_package(CURL 7.45.0 REQUIRED)
+find_package(LibXml2 2.8.0 REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(Sqlite REQUIRED)
 
+if (ENABLE_XSLT)
+    find_package(LibXslt 1.1.7 REQUIRED)
+endif ()
+
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)
 
 set(USE_CF 1)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f79c7eb..894328e 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 libxml2 and libxstl
+        https://bugs.webkit.org/show_bug.cgi?id=176042
+
+        Reviewed by Konstantin Tokarev.
+
+        * TestWebKitAPI/PlatformWin.cmake:
+
 2017-08-29  Per Arne Vollan  <pvollan@apple.com>
 
         [Win] A WTF test is timing out in run-api-tests.

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