WebKit Bugzilla
Attachment 371055 Details for
Bug 198400
: [CMake] Add WebKit::WTF target
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198400.diff (text/plain), 15.07 KB, created by
Don Olmstead
on 2019-05-31 06:46:04 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Don Olmstead
Created:
2019-05-31 06:46:04 PDT
Size:
15.07 KB
patch
obsolete
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt >index 838f34558d5..9415ea07154 100644 >--- a/Source/JavaScriptCore/CMakeLists.txt >+++ b/Source/JavaScriptCore/CMakeLists.txt >@@ -7,7 +7,6 @@ list(APPEND JavaScriptCore_UNIFIED_SOURCE_LIST_FILES > ) > > set(JavaScriptCore_INCLUDE_DIRECTORIES >- "${WTF_FRAMEWORK_HEADERS_DIR}" > "${JavaScriptCore_FRAMEWORK_HEADERS_DIR}" > ) > >@@ -116,7 +115,7 @@ set(JavaScriptCore_OBJECT_LUT_SOURCES > ) > > set(JavaScriptCore_LIBRARIES >- WTF${DEBUG_SUFFIX} >+ WebKit::WTF > ) > > if (USE_CAPSTONE) >@@ -290,9 +289,9 @@ add_executable(LLIntOffsetsExtractor > ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredOffsets.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeStructs.h > ) > >-target_link_libraries(LLIntSettingsExtractor WTF) >+target_link_libraries(LLIntSettingsExtractor WebKit::WTF) > add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders) >-target_link_libraries(LLIntOffsetsExtractor WTF) >+target_link_libraries(LLIntOffsetsExtractor WebKit::WTF) > add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders) > > # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 36eed081c66..5939e028b92 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,15 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use the WebKit::WTF target. >+ >+ * CMakeLists.txt: >+ * shell/CMakeLists.txt: >+ > 2019-05-30 Devin Rousso <drousso@apple.com> > > Web Inspector: Audit: there should be a default test for WebInspectorAudit.Resources functionality >diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt >index 434f9c60037..7acfa89031e 100644 >--- a/Source/JavaScriptCore/shell/CMakeLists.txt >+++ b/Source/JavaScriptCore/shell/CMakeLists.txt >@@ -8,8 +8,7 @@ endif () > > set(jsc_LIBRARIES > ${CMAKE_DL_LIBS} >- JavaScriptCore${DEBUG_SUFFIX} >- WTF${DEBUG_SUFFIX} >+ JavaScriptCore > ) > > set(jsc_PRIVATE_INCLUDE_DIRECTORIES >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index a5cad1dce98..9acdcd1096a 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,15 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Create the WebKit::WTF target and use that to propagate headers. Use >+ WEBKIT_COPY_FILES instead of WEBKIT_MAKE_FORWARDING_HEADERS. >+ >+ * 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..975d87132a5 100644 >--- a/Source/WTF/wtf/CMakeLists.txt >+++ b/Source/WTF/wtf/CMakeLists.txt >@@ -454,7 +454,10 @@ set(WTF_SOURCES > threads/BinarySemaphore.cpp > threads/Signals.cpp > >+ unicode/CollatorDefault.cpp > unicode/UTF8Conversion.cpp >+ >+ unicode/icu/CollatorICU.cpp > ) > > set(WTF_INCLUDE_DIRECTORIES >@@ -485,30 +488,28 @@ if (NOT USE_SYSTEM_MALLOC) > list(APPEND WTF_LIBRARIES WebKit::bmalloc) > endif () > >-list(APPEND WTF_SOURCES >- unicode/CollatorDefault.cpp >- >- unicode/icu/CollatorICU.cpp >-) >- > list(APPEND WTF_LIBRARIES > ICU::data > ICU::i18n > ICU::uc > ) > >+set(WTF_INTERFACE_LIBRARIES WTF) >+set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR}) >+set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders) >+ > WEBKIT_FRAMEWORK_DECLARE(WTF) > WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() > >-WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES}) >-WEBKIT_FRAMEWORK(WTF) >- >-WEBKIT_MAKE_FORWARDING_HEADERS(WTF >- TARGET_NAME WTFFrameworkHeaders >+WEBKIT_COPY_FILES(WTF_CopyHeaders > DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf > FILES ${WTF_PUBLIC_HEADERS} > ) > >+WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES}) >+WEBKIT_FRAMEWORK(WTF) >+WEBKIT_FRAMEWORK_TARGET(WTF) >+ > if (MSVC) > set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS") > set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS") >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index b4bd44c2974..2d99b0c9976 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,14 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use the WebKit::WTF target. >+ >+ * PlatformWin.cmake: >+ > 2019-05-31 Zalan Bujtas <zalan@apple.com> > > [LFC][IFC] Move final runs to a dedicated class (Line::Content) >diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake >index eaf009f7b02..f485e093590 100644 >--- a/Source/WebCore/PlatformWin.cmake >+++ b/Source/WebCore/PlatformWin.cmake >@@ -236,9 +236,4 @@ if (WTF_PLATFORM_WIN_CAIRO AND EXISTS ${WEBKIT_LIBRARIES_DIR}/etc/ssl/cert.pem) > ) > endif () > >-set(WebCore_OUTPUT_NAME >- WebCore${DEBUG_SUFFIX} >-) >- >-list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX}) >-list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX}) >+set(WebCore_OUTPUT_NAME WebCore${DEBUG_SUFFIX}) >diff --git a/Source/WebDriver/CMakeLists.txt b/Source/WebDriver/CMakeLists.txt >index fa50eefe137..eeaa4f09d0a 100644 >--- a/Source/WebDriver/CMakeLists.txt >+++ b/Source/WebDriver/CMakeLists.txt >@@ -6,7 +6,6 @@ set(WebDriver_PRIVATE_INCLUDE_DIRECTORIES > "${CMAKE_BINARY_DIR}" > "${WEBDRIVER_DIR}" > "${DERIVED_SOURCES_WEBDRIVER_DIR}" >- "${WTF_FRAMEWORK_HEADERS_DIR}" > ) > > set(WebDriver_SOURCES >@@ -19,7 +18,7 @@ set(WebDriver_SOURCES > ) > > set(WebDriver_LIBRARIES >- WTF >+ WebKit::WTF > ) > > set(WebDriver_SCRIPTS >diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog >index c92490b8521..098e4088e5a 100644 >--- a/Source/WebDriver/ChangeLog >+++ b/Source/WebDriver/ChangeLog >@@ -1,3 +1,14 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use the WebKit::WTF target. >+ >+ * CMakeLists.txt: >+ > 2019-05-21 Don Olmstead <don.olmstead@sony.com> > > [WinCairo] Build WebDriver >diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog >index f2c8bc7bd71..02f0f89a058 100644 >--- a/Source/WebKitLegacy/ChangeLog >+++ b/Source/WebKitLegacy/ChangeLog >@@ -1,3 +1,14 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use the WebKit::WTF target. >+ >+ * PlatformWin.cmake: >+ > 2019-05-27 Chris Dumez <cdumez@apple.com> > > Use a strongly-typed identifier for pages >diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake >index b405d6d80c5..bec926272c7 100644 >--- a/Source/WebKitLegacy/PlatformWin.cmake >+++ b/Source/WebKitLegacy/PlatformWin.cmake >@@ -31,8 +31,6 @@ else () > ) > endif () > >-list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX}) >- > add_custom_command( > OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitVersion.h > MAIN_DEPENDENCY ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl >diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog >index 0a5fb316018..7d5550fea95 100644 >--- a/Source/WebKitLegacy/win/ChangeLog >+++ b/Source/WebKitLegacy/win/ChangeLog >@@ -1,3 +1,14 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use the WebKit::WTF target. >+ >+ * WebKitQuartzCoreAdditions/CMakeLists.txt: >+ > 2019-05-30 Simon Fraser <simon.fraser@apple.com> > > Use an OptionSet<> for GraphicsLayerPaintingPhase >diff --git a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt b/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt >index c721b25e608..f15d53fc561 100644 >--- a/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt >+++ b/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt >@@ -44,7 +44,6 @@ WEBKIT_ADD_PRECOMPILED_HEADER("WebKitQuartzCoreAdditionsPrefix.h" "WebKitQuartzC > > include_directories( > . >- "${WTF_FRAMEWORK_HEADERS_DIR}" > "${DERIVED_SOURCES_DIR}/ForwardingHeaders" > "${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions" > "${CMAKE_BINARY_DIR}/../include/private" >@@ -60,7 +59,7 @@ add_library(WebKitQuartzCoreAdditions SHARED ${WebKitQuartzCoreAdditions_SOURCES > set_target_properties(WebKitQuartzCoreAdditions PROPERTIES OUTPUT_NAME WebKitQuartzCoreAdditions${DEBUG_SUFFIX}) > target_link_libraries(WebKitQuartzCoreAdditions > D3d9 >- WTF${DEBUG_SUFFIX} >+ WebKit::WTF > CoreFoundation${DEBUG_SUFFIX} > CoreGraphics${DEBUG_SUFFIX} > QuartzCore${DEBUG_SUFFIX} >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index aff8e2955b9..99ab468b64d 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,22 @@ >+2019-05-31 Don Olmstead <don.olmstead@sony.com> >+ >+ [CMake] Add WebKit::WTF target >+ https://bugs.webkit.org/show_bug.cgi?id=198400 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use the WebKit::WTF target. >+ >+ * DumpRenderTree/CMakeLists.txt: >+ * DumpRenderTree/PlatformWin.cmake: >+ * MiniBrowser/win/CMakeLists.txt: >+ * TestWebKitAPI/CMakeLists.txt: >+ * TestWebKitAPI/PlatformGTK.cmake: >+ * TestWebKitAPI/PlatformWPE.cmake: >+ * TestWebKitAPI/PlatformWin.cmake: >+ * WebKitTestRunner/PlatformGTK.cmake: >+ * WebKitTestRunner/PlatformWin.cmake: >+ > 2019-05-31 Carlos Garcia Campos <cgarcia@igalia.com> > > [WPE] Build at-spi2-core without x11 support in jhbuild >diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt >index bdcebaf547d..d61cbf43e61 100644 >--- a/Tools/DumpRenderTree/CMakeLists.txt >+++ b/Tools/DumpRenderTree/CMakeLists.txt >@@ -68,7 +68,6 @@ set(TestNetscapePlugIn_SOURCES > > set(TestNetscapePlugIn_LIBRARIES > JavaScriptCore >- WTF > WebCoreTestSupport > ) > >diff --git a/Tools/DumpRenderTree/PlatformWin.cmake b/Tools/DumpRenderTree/PlatformWin.cmake >index e83b40139ae..db4f6d3164e 100644 >--- a/Tools/DumpRenderTree/PlatformWin.cmake >+++ b/Tools/DumpRenderTree/PlatformWin.cmake >@@ -68,7 +68,6 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES > ) > > list(APPEND DumpRenderTree_LIBRARIES >- WTF > WebKitLegacy > shlwapi > ) >diff --git a/Tools/MiniBrowser/win/CMakeLists.txt b/Tools/MiniBrowser/win/CMakeLists.txt >index 98bfd7cec57..30b73dfba98 100644 >--- a/Tools/MiniBrowser/win/CMakeLists.txt >+++ b/Tools/MiniBrowser/win/CMakeLists.txt >@@ -1,5 +1,4 @@ > set(MiniBrowser_INCLUDE_DIRECTORIES >- ${WTF_FRAMEWORK_HEADERS_DIR} > ${JavaScriptCore_FRAMEWORK_HEADERS_DIR} > ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR} > ${PAL_FRAMEWORK_HEADERS_DIR} >@@ -28,7 +27,7 @@ set(MiniBrowser_SOURCES > > set(MiniBrowser_LIBRARIES > DbgHelp >- WTF >+ WebKit::WTF > WebKitLegacy > WebKitLegacyGUID > comctl32 >diff --git a/Tools/TestWebKitAPI/CMakeLists.txt b/Tools/TestWebKitAPI/CMakeLists.txt >index c78fc07cd01..bdaca4972d4 100644 >--- a/Tools/TestWebKitAPI/CMakeLists.txt >+++ b/Tools/TestWebKitAPI/CMakeLists.txt >@@ -102,16 +102,13 @@ set(TestWTF_PRIVATE_INCLUDE_DIRECTORIES > ${CMAKE_BINARY_DIR} > ${TESTWEBKITAPI_DIR} > ${THIRDPARTY_DIR}/gtest/include >- ${WTF_FRAMEWORK_HEADERS_DIR} > ) > > set(TestWTF_LIBRARIES >- WTF >+ WebKit::WTF > gtest > ) > >-set(TestWTF_DEPENDENCIES WTFFrameworkHeaders) >- > WEBKIT_EXECUTABLE_DECLARE(TestWTF) > > # TestWebCore definitions >@@ -156,7 +153,6 @@ if (ENABLE_WEBCORE) > ${THIRDPARTY_DIR}/gtest/include > ${PAL_FRAMEWORK_HEADERS_DIR} > ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR} >- ${WTF_FRAMEWORK_HEADERS_DIR} > ) > > set(TestWebCore_DEPENDENCIES WebCorePrivateFrameworkHeaders) >@@ -181,7 +177,6 @@ if (ENABLE_WEBKIT_LEGACY) > ${THIRDPARTY_DIR}/gtest/include > ${PAL_FRAMEWORK_HEADERS_DIR} > ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR} >- ${WTF_FRAMEWORK_HEADERS_DIR} > ${WebKitLegacy_FRAMEWORK_HEADERS_DIR} > ) > >@@ -253,7 +248,6 @@ if (ENABLE_WEBKIT) > ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR} > ${JavaScriptCore_FRAMEWORK_HEADERS_DIR} > ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR} >- ${WTF_FRAMEWORK_HEADERS_DIR} > ${WebKit_FRAMEWORK_HEADERS_DIR} > ) > >diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake >index 6aca35ba8ee..821f3637b4f 100644 >--- a/Tools/TestWebKitAPI/PlatformGTK.cmake >+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake >@@ -105,7 +105,6 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES > ${GLIB_INCLUDE_DIRS} > ${GTK3_INCLUDE_DIRS} > ${THIRDPARTY_DIR}/gtest/include >- ${WTF_FRAMEWORK_HEADERS_DIR} > ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR} > ${FORWARDING_HEADERS_DIR} > ${FORWARDING_HEADERS_DIR}/JavaScriptCore >diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake >index 47bf7b35a72..7c676ba5602 100644 >--- a/Tools/TestWebKitAPI/PlatformWPE.cmake >+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake >@@ -100,7 +100,6 @@ set(TestJSC_PRIVATE_INCLUDE_DIRECTORIES > ${CMAKE_BINARY_DIR} > ${TESTWEBKITAPI_DIR} > ${THIRDPARTY_DIR}/gtest/include >- ${WTF_FRAMEWORK_HEADERS_DIR} > ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR} > ${FORWARDING_HEADERS_DIR} > ${FORWARDING_HEADERS_DIR}/JavaScriptCore >diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake >index 4aa7cd95061..0c48cf04fe5 100644 >--- a/Tools/TestWebKitAPI/PlatformWin.cmake >+++ b/Tools/TestWebKitAPI/PlatformWin.cmake >@@ -108,7 +108,7 @@ if (ENABLE_WEBKIT_LEGACY) > list(APPEND TestWebKitLegacy_DEFINITIONS ${webcore_DEFINITIONS}) > > list(APPEND TestWebKitLegacy_LIBRARIES >- WTF >+ WebKit::WTF > ) > > list(APPEND TestWebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES >diff --git a/Tools/WebKitTestRunner/PlatformGTK.cmake b/Tools/WebKitTestRunner/PlatformGTK.cmake >index b0af11ee026..beda87bc229 100644 >--- a/Tools/WebKitTestRunner/PlatformGTK.cmake >+++ b/Tools/WebKitTestRunner/PlatformGTK.cmake >@@ -29,7 +29,6 @@ list(APPEND WebKitTestRunner_LIBRARIES > ${CAIRO_LIBRARIES} > ${GTK3_LIBRARIES} > ${GLIB_LIBRARIES} >- WTF > WebCore > WebCorePlatformGTK > ) >diff --git a/Tools/WebKitTestRunner/PlatformWin.cmake b/Tools/WebKitTestRunner/PlatformWin.cmake >index f244cd6be5a..fe82701799d 100644 >--- a/Tools/WebKitTestRunner/PlatformWin.cmake >+++ b/Tools/WebKitTestRunner/PlatformWin.cmake >@@ -36,7 +36,6 @@ set(WebKitTestRunnerLib_LIBRARIES > ) > > list(APPEND WebKitTestRunner_LIBRARIES >- WTF > WebKit > ) > >@@ -45,7 +44,6 @@ set(WebKitTestRunnerInjectedBundle_LIBRARIES > WebKit > ) > >- > list(REMOVE_ITEM > WebKitTestRunnerLib_SOURCES > ${WEBKIT_TESTRUNNER_BINDINGS_DIR}/JSWrapper.cpp
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198400
:
371011
| 371055