Diff
Modified: trunk/ChangeLog (260276 => 260277)
--- trunk/ChangeLog 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/ChangeLog 2020-04-17 20:15:01 UTC (rev 260277)
@@ -1,3 +1,14 @@
+2020-04-17 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCore target
+ https://bugs.webkit.org/show_bug.cgi?id=210445
+
+ Reviewed by Michael Catanzaro.
+
+ Add a target file for internal Apple Windows builds.
+
+ * Source/cmake/target/WebCore.cmake: Added.
+
2020-04-16 Carlos Garcia Campos <[email protected]>
[GTK4] Disable netscape plugins API
Modified: trunk/Source/WebCore/CMakeLists.txt (260276 => 260277)
--- trunk/Source/WebCore/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -1681,16 +1681,12 @@
set(WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/WorkletGlobalScopeConstructors.idl)
set(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE ${WebCore_DERIVED_SOURCES_DIR}/PaintWorkletGlobalScopeConstructors.idl)
+set(WebCore_INTERFACE_LIBRARIES WebCore)
+set(WebCore_INTERFACE_INCLUDE_DIRECTORIES ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR})
+
WEBKIT_FRAMEWORK_DECLARE(WebCore)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
- TARGET_NAME WebCorePrivateFrameworkHeaders
- DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
- FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
- FLATTENED
-)
-
# Generate CommandLineAPIModuleSource.h
add_custom_command(
OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.h ${WebCore_DERIVED_SOURCES_DIR}/CommandLineAPIModuleSource.min.js
@@ -1864,6 +1860,7 @@
--serviceWorkerGlobalScopeConstructorsFile ${SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
--workletGlobalScopeConstructorsFile ${WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE}
--paintWorkletGlobalScopeConstructorsFile ${PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE})
+list(APPEND WebCore_DEPENDENCIES WebCoreBindings)
GENERATE_BINDINGS(WebCoreTestSupportBindings
OUTPUT_SOURCE WebCoreTestSupport_SOURCES
@@ -2002,11 +1999,16 @@
WEBKIT_ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
endif ()
+WEBKIT_COPY_FILES(WebCore_CopyPrivateHeaders
+ DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCore
+ FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
+ FLATTENED
+)
+list(APPEND WebCore_INTERFACE_DEPENDENCIES WebCore_CopyPrivateHeaders)
+
WEBKIT_FRAMEWORK(WebCore)
+WEBKIT_FRAMEWORK_TARGET(WebCore)
-add_dependencies(WebCore WebCoreBindings)
-add_dependencies(WebCorePrivateFrameworkHeaders WebCoreBindings)
-
if (APPLE)
set_target_properties(WebCore PROPERTIES LINK_FLAGS "-sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy")
endif ()
@@ -2019,15 +2021,6 @@
WEBKIT_ADD_TARGET_CXX_FLAGS(WebCore -fno-tree-sra)
endif ()
-# Include paths of WebCore doesn't propagate to targets using WebKit
-# because WebCore is linked to WebKit as a PRIVATE library. Forwarding
-# headers generated by generate-forwarding-headers.pl needs include
-# paths of WebCore.
-add_library(WebCoreHeaderInterface INTERFACE)
-target_include_directories(WebCoreHeaderInterface INTERFACE ${WebCore_INCLUDE_DIRECTORIES})
-target_include_directories(WebCoreHeaderInterface SYSTEM INTERFACE ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
-target_link_libraries(WebCoreHeaderInterface INTERFACE ${WebCore_LIBRARIES})
-
if (MSVC)
WEBKIT_ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
endif ()
Modified: trunk/Source/WebCore/ChangeLog (260276 => 260277)
--- trunk/Source/WebCore/ChangeLog 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebCore/ChangeLog 2020-04-17 20:15:01 UTC (rev 260277)
@@ -1,3 +1,15 @@
+2020-04-17 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCore target
+ https://bugs.webkit.org/show_bug.cgi?id=210445
+
+ Reviewed by Michael Catanzaro.
+
+ Add a WebKit::WebCore target. Remove the WebCoreHeaderInterface target since
+ the WebKit::WebCore target is functionaly the same.
+
+ * CMakeLists.txt:
+
2020-04-17 Ryan Haddad <[email protected]>
Unreviewed, reverting r260245.
Modified: trunk/Source/WebKit/CMakeLists.txt (260276 => 260277)
--- trunk/Source/WebKit/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKit/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -263,17 +263,8 @@
WebProcess/WebStorage/StorageAreaMap.messages.in
)
-if (${WebCore_LIBRARY_TYPE} STREQUAL SHARED)
- # All users of WebKit need to link WebCore if WebCore is a shared library.
- if (APPLE)
- set(WebKit_PRIVATE_LIBRARIES WebCore)
- else ()
- set(WebKit_LIBRARIES WebCore)
- endif ()
-else ()
- set(WebKit_LIBRARIES WebCoreHeaderInterface)
- set(WebKit_PRIVATE_LIBRARIES WebCore)
-endif ()
+# FIXME: https://bugs.webkit.org/show_bug.cgi?id=210366
+set(WebKit_LIBRARIES WebKit::WebCore)
set(WebProcess_LIBRARIES
WebKit
@@ -334,6 +325,13 @@
endif ()
endif ()
+if (USE_LIBWEBRTC)
+ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/libwebrtc/Source/"
+ "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
+ "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/abseil-cpp")
+ list(APPEND WebKit_LIBRARIES webrtc)
+endif ()
+
if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
list(APPEND WebKit_PRIVATE_LIBRARIES atomic)
endif ()
Modified: trunk/Source/WebKit/ChangeLog (260276 => 260277)
--- trunk/Source/WebKit/ChangeLog 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKit/ChangeLog 2020-04-17 20:15:01 UTC (rev 260277)
@@ -1,3 +1,17 @@
+2020-04-17 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCore target
+ https://bugs.webkit.org/show_bug.cgi?id=210445
+
+ Reviewed by Michael Catanzaro.
+
+ Use the WebKit::WebCore target within the WebKit target.
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * PlatformWin.cmake:
+
2020-04-17 Simon Fraser <[email protected]>
Turn async frame and overflow scrolling on by default on macOS
Modified: trunk/Source/WebKit/PlatformGTK.cmake (260276 => 260277)
--- trunk/Source/WebKit/PlatformGTK.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -421,6 +421,7 @@
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${ENCHANT_INCLUDE_DIRS}
+ ${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
${GSTREAMER_PBUTILS_INCLUDE_DIRS}
Modified: trunk/Source/WebKit/PlatformWPE.cmake (260276 => 260277)
--- trunk/Source/WebKit/PlatformWPE.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -276,6 +276,7 @@
list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
${ATK_BRIDGE_INCLUDE_DIRS}
+ ${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
${LIBSECCOMP_INCLUDE_DIRS}
Modified: trunk/Source/WebKit/PlatformWin.cmake (260276 => 260277)
--- trunk/Source/WebKit/PlatformWin.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKit/PlatformWin.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -173,6 +173,7 @@
)
list(APPEND WebKit_PRIVATE_LIBRARIES
+ $<TARGET_OBJECTS:WebCore>
OpenSSL::SSL
mfuuid.lib
strmiids.lib
Modified: trunk/Source/WebKitLegacy/CMakeLists.txt (260276 => 260277)
--- trunk/Source/WebKitLegacy/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKitLegacy/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -3,6 +3,7 @@
include(target/TargetWTF)
include(target/TargetJavaScriptCore)
include(target/PAL)
+include(target/WebCore)
set_property(DIRECTORY . PROPERTY FOLDER "WebKitLegacy")
set(WebKitLegacy_SOURCES
@@ -25,14 +26,13 @@
"${CMAKE_BINARY_DIR}"
"${WEBKITLEGACY_DIR}/Storage"
"${WEBKITLEGACY_DIR}/WebCoreSupport"
- "${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
"${WebKitLegacy_DERIVED_SOURCES_DIR}"
)
set(WebKitLegacy_PRIVATE_LIBRARIES
- WebCore${DEBUG_SUFFIX}
WebKit::_javascript_Core
WebKit::PAL
+ WebKit::WebCore
)
WEBKIT_FRAMEWORK_DECLARE(WebKitLegacy)
@@ -46,9 +46,6 @@
WEBKIT_FRAMEWORK(WebKitLegacy)
-if (NOT INTERNAL_BUILD)
- add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
-endif ()
if (TARGET WebKitLegacyGUID)
add_dependencies(WebKitLegacy WebKitLegacyGUID)
endif ()
Modified: trunk/Source/WebKitLegacy/ChangeLog (260276 => 260277)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-04-17 20:15:01 UTC (rev 260277)
@@ -1,3 +1,16 @@
+2020-04-17 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCore target
+ https://bugs.webkit.org/show_bug.cgi?id=210445
+
+ Reviewed by Michael Catanzaro.
+
+ Use the WebKit::WebCore target within WebKitLegacy.
+
+ * CMakeLists.txt:
+ * PlatformFTW.cmake:
+ * PlatformWin.cmake:
+
2020-04-08 Truitt Savell <[email protected]>
Unreviewed, reverting r259708.
Modified: trunk/Source/WebKitLegacy/PlatformFTW.cmake (260276 => 260277)
--- trunk/Source/WebKitLegacy/PlatformFTW.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKitLegacy/PlatformFTW.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -469,7 +469,6 @@
FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
FLATTENED
)
-add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
set(WebKitLegacy_OUTPUT_NAME
WebKit${DEBUG_SUFFIX}
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (260276 => 260277)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -423,6 +423,7 @@
set_target_properties(WebKitLegacyGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
+ $<TARGET_OBJECTS:WebCore>
Comctl32
Comsupp
Crypt32
@@ -483,7 +484,7 @@
FLATTENED
)
if (NOT INTERNAL_BUILD)
- add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+ add_dependencies(WebKitLegacyFrameworkHeaders WebCore_CopyPrivateHeaders)
endif ()
set(WebKitLegacy_OUTPUT_NAME
Added: trunk/Source/cmake/target/WebCore.cmake (0 => 260277)
--- trunk/Source/cmake/target/WebCore.cmake (rev 0)
+++ trunk/Source/cmake/target/WebCore.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -0,0 +1,18 @@
+if (NOT TARGET WebKit::WebCore)
+ if (NOT INTERNAL_BUILD)
+ message(FATAL_ERROR "WebKit::WebCore target not found")
+ endif ()
+
+ # This should be moved to an if block if the Apple Mac/iOS build moves completely to CMake
+ # Just assuming Windows for the moment
+ add_library(WebKit::WebCore STATIC IMPORTED)
+ set_target_properties(WebKit::WebCore PROPERTIES
+ IMPORTED_LOCATION ${WEBKIT_LIBRARIES_LINK_DIR}/WebCore${DEBUG_SUFFIX}.lib
+ # Should add Apple libraries here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
+ INTERFACE_LINK_LIBRARIES "WebKit::WTF;WebCore::_javascript_Core"
+ )
+ set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private")
+ target_include_directories(WebKit::WebCore INTERFACE
+ ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ )
+endif ()
Modified: trunk/Tools/ChangeLog (260276 => 260277)
--- trunk/Tools/ChangeLog 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/ChangeLog 2020-04-17 20:15:01 UTC (rev 260277)
@@ -1,3 +1,20 @@
+2020-04-17 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCore target
+ https://bugs.webkit.org/show_bug.cgi?id=210445
+
+ Reviewed by Michael Catanzaro.
+
+ Use the WebKit::WebCore target within tests and developer tools.
+
+ * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
+ * MiniBrowser/wpe/CMakeLists.txt:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/PlatformWPE.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+ * TestWebKitAPI/glib/CMakeLists.txt:
+
2020-04-17 Antoine Quint <[email protected]>
Stop including style rules related to media controls in the UA style sheet when Modern Media Controls are enabled
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (260276 => 260277)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -65,7 +65,7 @@
add_library(TestNetscapePlugIn SHARED ${WebKitTestNetscapePlugIn_SOURCES})
target_link_libraries(TestNetscapePlugIn ${WebKitTestNetscapePlugIn_LIBRARIES})
-add_dependencies(TestNetscapePlugIn WebCorePrivateFrameworkHeaders)
+add_dependencies(TestNetscapePlugIn WebKit::WebCore)
set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
WEBKIT_ADD_TARGET_CXX_FLAGS(TestNetscapePlugIn -Wno-unused-parameter)
Modified: trunk/Tools/MiniBrowser/wpe/CMakeLists.txt (260276 => 260277)
--- trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -12,6 +12,9 @@
set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
+ ${GSTREAMER_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
${WPEBACKEND_FDO_INCLUDE_DIRS}
)
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (260276 => 260277)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -153,11 +153,9 @@
)
set(TestWebCore_LIBRARIES
+ WebKit::WebCore
gtest
)
- if (NOT APPLE)
- list(APPEND TestWebCore_LIBRARIES WebCore WebCoreHeaderInterface)
- endif ()
set(TestWebCore_PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
@@ -167,8 +165,6 @@
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
)
- set(TestWebCore_DEPENDENCIES WebCorePrivateFrameworkHeaders)
-
WEBKIT_EXECUTABLE_DECLARE(TestWebCore)
endif ()
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (260276 => 260277)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -40,6 +40,8 @@
list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
+ ${GSTREAMER_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
)
list(APPEND TestWebCore_LIBRARIES
@@ -62,6 +64,7 @@
)
list(APPEND TestWebKit_SYSTEM_INCLUDE_DIRECTORIES
+ ${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
)
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (260276 => 260277)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -8,14 +8,6 @@
list(APPEND TestWebKit_DEPENDENCIES TestWebKitAPI-forwarding-headers)
add_dependencies(TestWebKitAPIInjectedBundle TestWebKitAPI-forwarding-headers)
-include_directories(SYSTEM
- ${GLIB_INCLUDE_DIRS}
- ${GSTREAMER_INCLUDE_DIRS}
- ${GSTREAMER_AUDIO_INCLUDE_DIRS}
- ${LIBSOUP_INCLUDE_DIRS}
- ${WPEBACKEND_FDO_INCLUDE_DIRS}
-)
-
set(test_main_SOURCES generic/main.cpp)
# TestWTF
@@ -44,6 +36,8 @@
list(APPEND TestWebCore_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
+ ${GSTREAMER_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
)
# TestWebKit
@@ -64,6 +58,7 @@
)
list(APPEND TestWebKit_SYSTEM_INCLUDE_DIRECTORIES
+ ${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
)
@@ -87,6 +82,7 @@
target_include_directories(TestWebKitAPIInjectedBundle PRIVATE
${CMAKE_SOURCE_DIR}/Source
${FORWARDING_HEADERS_DIR}
+ ${GLIB_INCLUDE_DIRS}
)
# TestJSC
@@ -94,6 +90,10 @@
Tests/_javascript_Core/glib/TestJSC.cpp
)
+set(TestJSC_SYSTEM_INCLUDE_DIRECTORIES
+ ${GLIB_INCLUDE_DIRS}
+)
+
set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (260276 => 260277)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2020-04-17 20:15:01 UTC (rev 260277)
@@ -41,15 +41,16 @@
list(APPEND TestWebCore_DEFINITIONS ${webcore_DEFINITIONS})
list(APPEND TestWebCore_LIBRARIES
+ $<TARGET_OBJECTS:WebCore>
Crypt32
D2d1
Dwrite
- dxguid
Iphlpapi
Psapi
Shlwapi
Usp10
WindowsCodecs
+ dxguid
)
if (${WTF_PLATFORM_WIN_CAIRO})
Modified: trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt (260276 => 260277)
--- trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2020-04-17 20:04:59 UTC (rev 260276)
+++ trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2020-04-17 20:15:01 UTC (rev 260277)
@@ -12,6 +12,7 @@
)
set(WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
+ ${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GSTREAMER_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
