Attachment 371054 Details for Bug 196717 – Patch

[patch] Patch

bug-196717.diff (text/plain), 5.57 KB, created by Don Olmstead on 2019-05-31 06:31:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-31 06:31:12 PDT

Size: 5.57 KB

patch

obsolete

>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 4d2e3f93208..1041684466f 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -457,13 +457,6 @@ set(WTF_SOURCES
>     unicode/UTF8Conversion.cpp
> )
> 
>-set(WTF_INCLUDE_DIRECTORIES
>-    # FIXME: https://bugs.webkit.org/show_bug.cgi?id=196734#c1
>-    "${CMAKE_BINARY_DIR}"
>-    "${DERIVED_SOURCES_DIR}"
>-    "${THIRDPARTY_DIR}"
>-)
>-
> set(WTF_PRIVATE_INCLUDE_DIRECTORIES
>     "${CMAKE_BINARY_DIR}"
>     "${WTF_DERIVED_SOURCES_DIR}"
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index b8e08c1fb42..d484619c945 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -415,6 +415,7 @@ ADD_WEBKIT_PREFIX_HEADER(WebKit)
> 
> add_executable(WebProcess ${WebProcess_SOURCES})
> ADD_WEBKIT_PREFIX_HEADER(WebProcess)
>+target_include_directories(WebProcess PRIVATE ${CMAKE_BINARY_DIR})
> target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
> 
> if (WebKit_WebProcess_OUTPUT_NAME)
>@@ -423,6 +424,7 @@ endif ()
> 
> add_executable(NetworkProcess ${NetworkProcess_SOURCES})
> ADD_WEBKIT_PREFIX_HEADER(NetworkProcess)
>+target_include_directories(NetworkProcess PRIVATE ${CMAKE_BINARY_DIR})
> target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
> 
> if (WebKit_NetworkProcess_OUTPUT_NAME)
>@@ -440,6 +442,7 @@ if (ENABLE_PLUGIN_PROCESS AND NOT "${PORT}" STREQUAL "Mac")
>     add_definitions(-DENABLE_PLUGIN_PROCESS=1)
>     add_executable(PluginProcess ${PluginProcess_SOURCES})
>     ADD_WEBKIT_PREFIX_HEADER(PluginProcess)
>+    target_include_directories(PluginProcess PRIVATE ${CMAKE_BINARY_DIR})
>     target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
>     install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
> 
>diff --git a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt b/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
>index c721b25e608..a348246fab3 100644
>--- a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
>+++ b/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt
>@@ -44,6 +44,7 @@ WEBKIT_ADD_PRECOMPILED_HEADER("WebKitQuartzCoreAdditionsPrefix.h" "WebKitQuartzC
> 
> include_directories(
>     .
>+    "${CMAKE_BINARY_DIR}"
>     "${WTF_FRAMEWORK_HEADERS_DIR}"
>     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
>     "${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions"
>diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
>index bdcebaf547d..27c36f4f853 100644
>--- a/Tools/DumpRenderTree/CMakeLists.txt
>+++ b/Tools/DumpRenderTree/CMakeLists.txt
>@@ -27,6 +27,7 @@ set(DumpRenderTree_LIBRARIES
> )
> 
> set(DumpRenderTree_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
>     ${DERIVED_SOURCES_DIR}/DumpRenderTree
>diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
>index a0d32059617..416c52c68d0 100644
>--- a/Tools/MiniBrowser/gtk/CMakeLists.txt
>+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
>@@ -21,6 +21,7 @@ set(MiniBrowser_SOURCES
> )
> 
> set(MiniBrowser_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${DERIVED_SOURCES_MINIBROWSER_DIR}
>     ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
>     ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
>diff --git a/Tools/MiniBrowser/mac/CMakeLists.txt b/Tools/MiniBrowser/mac/CMakeLists.txt
>index 65ff760b96b..7783b5218f5 100644
>--- a/Tools/MiniBrowser/mac/CMakeLists.txt
>+++ b/Tools/MiniBrowser/mac/CMakeLists.txt
>@@ -15,6 +15,7 @@ set(MiniBrowser_SOURCES
> )
> 
> set(MiniBrowser_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${CMAKE_SOURCE_DIR}/Source
>     ${FORWARDING_HEADERS_DIR}
>     ${MINIBROWSER_DIR}
>diff --git a/Tools/MiniBrowser/win/CMakeLists.txt b/Tools/MiniBrowser/win/CMakeLists.txt
>index 98bfd7cec57..6c2ef4cac92 100644
>--- a/Tools/MiniBrowser/win/CMakeLists.txt
>+++ b/Tools/MiniBrowser/win/CMakeLists.txt
>@@ -1,4 +1,5 @@
> set(MiniBrowser_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${WTF_FRAMEWORK_HEADERS_DIR}
>     ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
>     ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>diff --git a/Tools/MiniBrowser/wpe/CMakeLists.txt b/Tools/MiniBrowser/wpe/CMakeLists.txt
>index 245f319abf2..6933c3a8496 100644
>--- a/Tools/MiniBrowser/wpe/CMakeLists.txt
>+++ b/Tools/MiniBrowser/wpe/CMakeLists.txt
>@@ -5,6 +5,7 @@ set(MiniBrowser_SOURCES
> )
> 
> set(MiniBrowser_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${TOOLS_DIR}/wpe/backends/
>     ${DERIVED_SOURCES_WPE_API_DIR}
>     ${FORWARDING_HEADERS_WPE_DIR}
>diff --git a/Tools/TestWebKitAPI/glib/CMakeLists.txt b/Tools/TestWebKitAPI/glib/CMakeLists.txt
>index 2a743a71893..0719fb5dd2a 100644
>--- a/Tools/TestWebKitAPI/glib/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/glib/CMakeLists.txt
>@@ -7,6 +7,7 @@ set(WebKitGLibAPITests_SOURCES
> )
> 
> set(WebKitGLibAPITests_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${CMAKE_SOURCE_DIR}/Source
>     ${CMAKE_SOURCE_DIR}/Source/WTF
>     ${FORWARDING_HEADERS_DIR}
>@@ -169,6 +170,7 @@ endmacro()
> 
> if (PORT STREQUAL "WPE" AND ENABLE_WPE_QT_API)
>     set(WPEQtAPITests_INCLUDE_DIRECTORIES
>+        ${CMAKE_BINARY_DIR}
>         ${Qt5_INCLUDE_DIRS}
>         ${Qt5Test_INCLUDE_DIRS}
>     )
>diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
>index 632aa0b0675..f6a380e5916 100644
>--- a/Tools/WebKitTestRunner/CMakeLists.txt
>+++ b/Tools/WebKitTestRunner/CMakeLists.txt
>@@ -29,6 +29,7 @@ set(WebKitTestRunner_LIBRARIES
> )
> 
> set(WebKitTestRunner_INCLUDE_DIRECTORIES
>+    ${CMAKE_BINARY_DIR}
>     ${WEBKIT_TESTRUNNER_DIR}
>     ${WEBKIT_TESTRUNNER_DIR}/InjectedBundle
>     ${WEBKIT_TESTRUNNER_DIR}/InjectedBundle/Bindings

Flags:

annulen: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 196717: 371037 | 371039 | 371040 | 371054 | 371057 | 371067 | 397364 | 397370