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
+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
set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
${ICU_INCLUDE_DIRS}
+ ${LIBXML2_INCLUDE_DIR}
+ ${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIRS}
)
set(WebCore_LIBRARIES
${ICU_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
+ ${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
JavaScriptCore${DEBUG_SUFFIX}
PAL${DEBUG_SUFFIX}
+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
${LIBSECRET_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBTASN1_LIBRARIES}
- ${LIBXML2_LIBRARIES}
- ${LIBXSLT_LIBRARIES}
${HYPHEN_LIBRARIES}
${X11_X11_LIB}
${X11_Xcomposite_LIB}
${LIBSECRET_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
- ${LIBXML2_INCLUDE_DIR}
- ${LIBXSLT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
${ICU_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBTASN1_LIBRARIES}
- ${LIBXML2_LIBRARIES}
- ${LIBXSLT_LIBRARIES}
${WPE_LIBRARIES}
)
${ICU_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
- ${LIBXML2_INCLUDE_DIR}
- ${LIBXSLT_INCLUDE_DIR}
${WPE_INCLUDE_DIRS}
)
libcurl_imp
libjpeg
libpng
- libxml2
- libxslt
rpcrt4
shlwapi
usp10
+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
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 ()
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.
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)
+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.
libexslt${DEBUG_SUFFIX}
libicuin${DEBUG_SUFFIX}
libicuuc${DEBUG_SUFFIX}
- libxml2${DEBUG_SUFFIX}
- libxslt${DEBUG_SUFFIX}
zdll${DEBUG_SUFFIX}
)
endif ()