Attachment 371037 Details for Bug 196717 – Patch

[patch] Patch

bug-196717.diff (text/plain), 5.30 KB, created by Don Olmstead on 2019-05-30 23:03:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-30 23:03:07 PDT

Size: 5.30 KB

patch

obsolete

>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index a5cad1dce98..05fec4b1736 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-30  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
>+        https://bugs.webkit.org/show_bug.cgi?id=196717
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove CMAKE_BINARY_DIR from WTF_INCLUDE_DIRECTORIES to prevent it from
>+        propagating.
>+
>+        * wtf/CMakeLists.txt:
>+
> 2019-05-30  Saam Barati  <sbarati@apple.com>
> 
>         [WHLSL] Enforce variable lifetimes
>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/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 9dc1f2eda21..c803bfb1187 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-30  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
>+        https://bugs.webkit.org/show_bug.cgi?id=196717
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add CMAKE_BINARY_DIR to include directories.
>+
>+        * WebKitQuartzCoreAdditions/CMakeLists.txt:
>+
> 2019-05-26  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Dropped text, attachments, and images should animate into place
>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/ChangeLog b/Tools/ChangeLog
>index 28b304e6a7c..1e503a29425 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-05-30  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] CMAKE_BINARY_DIR should always be a PRIVATE include directory
>+        https://bugs.webkit.org/show_bug.cgi?id=196717
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add CMAKE_BINARY_DIR to include directories.
>+
>+        * MiniBrowser/gtk/CMakeLists.txt:
>+        * MiniBrowser/mac/CMakeLists.txt:
>+        * MiniBrowser/win/CMakeLists.txt:
>+        * MiniBrowser/wpe/CMakeLists.txt:
>+        * WebKitTestRunner/CMakeLists.txt:
>+
> 2019-05-30  Sihui Liu  <sihui_liu@apple.com>
> 
>         WKWebsiteDataStore API fails to fetch web storage data for non-persistent data store
>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/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

Actions: View | Formatted Diff | Diff

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