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
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
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIRS}
)
set(WebCore_IDL_INCLUDES
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
+ ${ZLIB_LIBRARIES}
JavaScriptCore${DEBUG_SUFFIX}
PAL${DEBUG_SUFFIX}
)
+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`
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"
${SYSTEMCONFIGURATION_LIBRARY}
${WEBKITSYSTEMINTERFACE_LIBRARY}
${XML2_LIBRARY}
- ${ZLIB_LIBRARIES}
)
add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
"${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"
)
version
winmm
ws2_32
- zdll
)
list(APPEND WebCoreTestSupport_LIBRARIES
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
PRIVATE libdispatch${DEBUG_SUFFIX}
PRIVATE libicuin${DEBUG_SUFFIX}
PRIVATE libicuuc${DEBUG_SUFFIX}
- PRIVATE zdll${DEBUG_SUFFIX}
)
endif ()
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)
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)
+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
libexslt${DEBUG_SUFFIX}
libicuin${DEBUG_SUFFIX}
libicuuc${DEBUG_SUFFIX}
- zdll${DEBUG_SUFFIX}
)
endif ()