Attachment 371319 Details for Bug 198493 – Patch

[patch] Patch

bug-198493.diff (text/plain), 6.51 KB, created by Don Olmstead on 2019-06-04 12:43:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-06-04 12:43:56 PDT

Size: 6.51 KB

patch

obsolete

>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 071ad2027ec..1d449ac87c3 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -16,10 +16,6 @@ list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "Sources.txt"
> )
> 
>-set(WebCore_INCLUDE_DIRECTORIES
>-    "${PAL_FRAMEWORK_HEADERS_DIR}"
>-)
>-
> set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${CMAKE_BINARY_DIR}"
>     "${WebCore_DERIVED_SOURCES_DIR}"
>@@ -1199,11 +1195,12 @@ set(WebCore_LIBRARIES
>     ${LIBXSLT_LIBRARIES}
>     ${SQLITE_LIBRARIES}
>     ${ZLIB_LIBRARIES}
>-    PAL${DEBUG_SUFFIX}
>+    WebKit::PAL
> )
> 
> set(WebCoreTestSupport_LIBRARIES
>     WebKit::JavaScriptCore
>+    WebKit::PAL
> )
> 
> if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
>@@ -1971,7 +1968,7 @@ add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
> target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
> target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
> target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES} ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
>-target_link_libraries(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_LIBRARIES})
>+target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
> 
> if (WebCoreTestSupport_OUTPUT_NAME)
>     set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ce55f4dba6e..5d9d446eeb1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::PAL target
>+        https://bugs.webkit.org/show_bug.cgi?id=198493
>+
>+        Reviewed by Konstantin Tokarev.
>+
>+        Use the WebKit::PAL target.
>+
>+        * CMakeLists.txt:
>+
> 2019-06-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::JavaScriptCore target
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index c3c5dd65166..c182e68da31 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::PAL target
>+        https://bugs.webkit.org/show_bug.cgi?id=198493
>+
>+        Reviewed by Konstantin Tokarev.
>+
>+        Create the WebKit::PAL target and use that to propagate headers. Use
>+        WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS.
>+
>+        * pal/CMakeLists.txt:
>+
> 2019-06-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::JavaScriptCore target
>diff --git a/Source/WebCore/PAL/pal/CMakeLists.txt b/Source/WebCore/PAL/pal/CMakeLists.txt
>index 1d072330d9c..bf346694194 100644
>--- a/Source/WebCore/PAL/pal/CMakeLists.txt
>+++ b/Source/WebCore/PAL/pal/CMakeLists.txt
>@@ -41,14 +41,18 @@ set(PAL_LIBRARIES
>     WebKit::JavaScriptCore
> )
> 
>+set(PAL_INTERFACE_LIBRARIES PAL)
>+set(PAL_INTERFACE_INCLUDE_DIRECTORIES ${PAL_FRAMEWORK_HEADERS_DIR})
>+set(PAL_INTERFACE_DEPENDENCIES PAL_CopyHeaders)
>+
> WEBKIT_FRAMEWORK_DECLARE(PAL)
> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> 
>-WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
>-WEBKIT_FRAMEWORK(PAL)
>-
>-WEBKIT_MAKE_FORWARDING_HEADERS(PAL
>-    TARGET_NAME PALFrameworkHeaders
>+WEBKIT_COPY_FILES(PAL_CopyHeaders
>     DESTINATION ${PAL_FRAMEWORK_HEADERS_DIR}/pal
>     FILES ${PAL_PUBLIC_HEADERS}
> )
>+
>+WEBKIT_WRAP_SOURCELIST(${PAL_SOURCES})
>+WEBKIT_FRAMEWORK(PAL)
>+WEBKIT_FRAMEWORK_TARGET(PAL)
>diff --git a/Source/WebKitLegacy/CMakeLists.txt b/Source/WebKitLegacy/CMakeLists.txt
>index 82681807dba..481fafe9ed3 100644
>--- a/Source/WebKitLegacy/CMakeLists.txt
>+++ b/Source/WebKitLegacy/CMakeLists.txt
>@@ -28,7 +28,6 @@ set(WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
> set(WebKitLegacy_LIBRARIES
>     PRIVATE WebKit::JavaScriptCore
>     PRIVATE WebCore${DEBUG_SUFFIX}
>-    PRIVATE PAL${DEBUG_SUFFIX}
> )
> 
> WEBKIT_FRAMEWORK_DECLARE(WebKitLegacy)
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index ec9d4a3b4ad..8681c9723c9 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::PAL target
>+        https://bugs.webkit.org/show_bug.cgi?id=198493
>+
>+        Reviewed by Konstantin Tokarev.
>+
>+        Use the WebKit::PAL target.
>+
>+        * CMakeLists.txt:
>+
> 2019-06-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::JavaScriptCore target
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b2854a67762..ff01641791b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-03  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add WebKit::PAL target
>+        https://bugs.webkit.org/show_bug.cgi?id=198493
>+
>+        Reviewed by Konstantin Tokarev.
>+
>+        Use the WebKit::PAL target.
>+
>+        * MiniBrowser/win/CMakeLists.txt:
>+        * TestWebKitAPI/CMakeLists.txt:
>+
> 2019-06-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::JavaScriptCore target
>diff --git a/Tools/MiniBrowser/win/CMakeLists.txt b/Tools/MiniBrowser/win/CMakeLists.txt
>index b4d5402699c..87f93f3024b 100644
>--- a/Tools/MiniBrowser/win/CMakeLists.txt
>+++ b/Tools/MiniBrowser/win/CMakeLists.txt
>@@ -1,5 +1,4 @@
> set(MiniBrowser_INCLUDE_DIRECTORIES
>-    ${PAL_FRAMEWORK_HEADERS_DIR}
>     ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
>     ${WebKit_FRAMEWORK_HEADERS_DIR}
>diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt
>index c49d97aedc3..37bc5326794 100644
>--- a/Tools/TestWebKitAPI/CMakeLists.txt
>+++ b/Tools/TestWebKitAPI/CMakeLists.txt
>@@ -151,7 +151,6 @@ if (ENABLE_WEBCORE)
>         ${CMAKE_BINARY_DIR}
>         ${TESTWEBKITAPI_DIR}
>         ${THIRDPARTY_DIR}/gtest/include
>-        ${PAL_FRAMEWORK_HEADERS_DIR}
>         ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>     )
> 
>@@ -175,7 +174,6 @@ if (ENABLE_WEBKIT_LEGACY)
>         ${CMAKE_BINARY_DIR}
>         ${TESTWEBKITAPI_DIR}
>         ${THIRDPARTY_DIR}/gtest/include
>-        ${PAL_FRAMEWORK_HEADERS_DIR}
>         ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>         ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
>     )
>@@ -244,7 +242,6 @@ if (ENABLE_WEBKIT)
>         ${CMAKE_BINARY_DIR}
>         ${TESTWEBKITAPI_DIR}
>         ${THIRDPARTY_DIR}/gtest/include
>-        ${PAL_FRAMEWORK_HEADERS_DIR}
>         ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
>         ${WebKit_FRAMEWORK_HEADERS_DIR}
>     )

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 198493: 371207 | 371220 | 371319 | 371338 | 371364 | 391819 | 391821 | 391824 | 391827 | 391897