Diff
Modified: trunk/ChangeLog (209664 => 209665)
--- trunk/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,16 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * Source/cmake/WebKitMacros.cmake:
+
2016-11-30 Brent Fulgham <bfulg...@apple.com>
[Win] Apple build is using incorrect ICU library (if present)
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (209664 => 209665)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -3,7 +3,6 @@
set_property(DIRECTORY . PROPERTY FOLDER "_javascript_Core")
set(_javascript_Core_INCLUDE_DIRECTORIES
- "${CMAKE_BINARY_DIR}"
"${_javascript_CORE_DIR}"
"${_javascript_CORE_DIR}/.."
"${_javascript_CORE_DIR}/API"
@@ -37,7 +36,6 @@
"${_javascript_CORE_DIR}/wasm"
"${_javascript_CORE_DIR}/wasm/js"
"${_javascript_CORE_DIR}/yarr"
- "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
@@ -1476,6 +1474,7 @@
WEBKIT_CREATE_FORWARDING_HEADERS(_javascript_Core DIRECTORIES ${_javascript_Core_FORWARDING_HEADERS_DIRECTORIES} FILES ${_javascript_Core_FORWARDING_HEADERS_FILES})
+target_include_directories(LLIntOffsetsExtractor PRIVATE ${_javascript_Core_INCLUDE_DIRECTORIES})
add_subdirectory(shell)
Modified: trunk/Source/_javascript_Core/ChangeLog (209664 => 209665)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,20 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformJSCOnly.cmake:
+ * PlatformMac.cmake:
+
2016-12-10 Michael Saboff <msab...@apple.com>
Unreviewed build fix for the CLOOP after r209653
Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (209664 => 209665)
--- trunk/Source/_javascript_Core/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,8 +1,3 @@
-list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
- "${WTF_DIR}/wtf/efl"
-)
-
list(APPEND _javascript_Core_SYSTEM_INCLUDE_DIRECTORIES
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_IMF_INCLUDE_DIRS}
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (209664 => 209665)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,9 +1,5 @@
set(_javascript_Core_OUTPUT_NAME _javascript_coregtk-${WEBKITGTK_API_VERSION})
-list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
-)
-
configure_file(_javascript_coregtk.pc.in ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
configure_file(_javascript_Core.gir.in ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir @ONLY)
Modified: trunk/Source/_javascript_Core/PlatformJSCOnly.cmake (209664 => 209665)
--- trunk/Source/_javascript_Core/PlatformJSCOnly.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/_javascript_Core/PlatformJSCOnly.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,9 +1,5 @@
add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
-list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
- "${WTF_DIR}"
-)
-
if (USE_GLIB)
list(APPEND _javascript_Core_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (209664 => 209665)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -24,7 +24,6 @@
)
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
- ${WTF_DIR}
${_javascript_CORE_DIR}/disassembler/udis86
${_javascript_CORE_DIR}/icu
)
Modified: trunk/Source/ThirdParty/ChangeLog (209664 => 209665)
--- trunk/Source/ThirdParty/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/ThirdParty/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,16 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * gtest/CMakeLists.txt:
+
2016-12-06 Alexey Proskuryakov <a...@apple.com>
Correct SDKROOT values in xcconfig files
Modified: trunk/Source/ThirdParty/gtest/CMakeLists.txt (209664 => 209665)
--- trunk/Source/ThirdParty/gtest/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/ThirdParty/gtest/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -9,9 +9,7 @@
"${GTEST_DIR}"
"${GTEST_DIR}/include"
"${_javascript_CORE_DIR}"
- "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${WTF_DIR}"
)
set(GTEST_SOURCES
Modified: trunk/Source/WebCore/CMakeLists.txt (209664 => 209665)
--- trunk/Source/WebCore/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -113,11 +113,8 @@
"${WEBCORE_DIR}/workers"
"${WEBCORE_DIR}/xml"
"${WEBCORE_DIR}/xml/parser"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
- "${CMAKE_BINARY_DIR}"
)
set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
@@ -3399,11 +3396,6 @@
endif ()
if (ENABLE_WEB_REPLAY)
- list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${_javascript_CORE_DIR}/inspector"
- "${_javascript_CORE_DIR}/replay"
- )
-
set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json ${_javascript_CORE_DIR}/replay/JSInputs.json)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
@@ -3876,7 +3868,9 @@
# files on OS X.
add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
-add_dependencies(WebCoreDerivedSources _javascript_Core WebCoreBindings)
+target_link_libraries(WebCoreDerivedSources ${WebCore_LIBRARIES})
+target_include_directories(WebCoreDerivedSources PUBLIC ${WebCore_INCLUDE_DIRECTORIES})
+add_dependencies(WebCoreDerivedSources WebCoreBindings)
if (NOT WIN32)
list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
endif ()
@@ -3905,9 +3899,9 @@
ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
endif ()
-include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
+target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
if (WebCoreTestSupport_OUTPUT_NAME)
Modified: trunk/Source/WebCore/ChangeLog (209664 => 209665)
--- trunk/Source/WebCore/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,22 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ No new tests needed.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * PlatformWinCairo.cmake:
+
2016-12-10 Ryosuke Niwa <rn...@webkit.org>
Replace isUnclosedNode by isClosedShadowHidden
Modified: trunk/Source/WebCore/PlatformEfl.cmake (209664 => 209665)
--- trunk/Source/WebCore/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -4,26 +4,6 @@
include(platform/TextureMapper.cmake)
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
- "${_javascript_CORE_DIR}"
- "${_javascript_CORE_DIR}/ForwardingHeaders"
- "${_javascript_CORE_DIR}/API"
- "${_javascript_CORE_DIR}/assembler"
- "${_javascript_CORE_DIR}/bytecode"
- "${_javascript_CORE_DIR}/bytecompiler"
- "${_javascript_CORE_DIR}/dfg"
- "${_javascript_CORE_DIR}/disassembler"
- "${_javascript_CORE_DIR}/domjit"
- "${_javascript_CORE_DIR}/heap"
- "${_javascript_CORE_DIR}/debugger"
- "${_javascript_CORE_DIR}/interpreter"
- "${_javascript_CORE_DIR}/jit"
- "${_javascript_CORE_DIR}/llint"
- "${_javascript_CORE_DIR}/parser"
- "${_javascript_CORE_DIR}/profiler"
- "${_javascript_CORE_DIR}/runtime"
- "${_javascript_CORE_DIR}/yarr"
"${THIRDPARTY_DIR}/ANGLE/"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/editing/atk"
@@ -49,8 +29,6 @@
"${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/efl"
"${WEBCORE_DIR}/plugins/efl"
- "${WTF_DIR}"
- "${WTF_DIR}/wtf/efl"
)
list(APPEND WebCore_SOURCES
Modified: trunk/Source/WebCore/PlatformGTK.cmake (209664 => 209665)
--- trunk/Source/WebCore/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -9,26 +9,6 @@
set(WebCore_OUTPUT_NAME WebCoreGTK)
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
- "${_javascript_CORE_DIR}"
- "${_javascript_CORE_DIR}/ForwardingHeaders"
- "${_javascript_CORE_DIR}/API"
- "${_javascript_CORE_DIR}/assembler"
- "${_javascript_CORE_DIR}/bytecode"
- "${_javascript_CORE_DIR}/bytecompiler"
- "${_javascript_CORE_DIR}/dfg"
- "${_javascript_CORE_DIR}/disassembler"
- "${_javascript_CORE_DIR}/domjit"
- "${_javascript_CORE_DIR}/heap"
- "${_javascript_CORE_DIR}/debugger"
- "${_javascript_CORE_DIR}/interpreter"
- "${_javascript_CORE_DIR}/jit"
- "${_javascript_CORE_DIR}/llint"
- "${_javascript_CORE_DIR}/parser"
- "${_javascript_CORE_DIR}/profiler"
- "${_javascript_CORE_DIR}/runtime"
- "${_javascript_CORE_DIR}/yarr"
"${THIRDPARTY_DIR}/ANGLE/"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/accessibility/atk"
@@ -56,7 +36,6 @@
"${WEBCORE_DIR}/platform/network/gtk"
"${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/gtk"
- "${WTF_DIR}"
)
list(APPEND WebCore_SOURCES
@@ -379,7 +358,6 @@
include_directories(
${WebCore_INCLUDE_DIRECTORIES}
"${WEBCORE_DIR}/bindings/gobject/"
- "${DERIVED_SOURCES_DIR}"
)
include_directories(SYSTEM
Modified: trunk/Source/WebCore/PlatformMac.cmake (209664 => 209665)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -68,9 +68,6 @@
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
- "${_javascript_CORE_DIR}/replay"
"${THIRDPARTY_DIR}/ANGLE"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/accessibility/mac"
@@ -126,7 +123,6 @@
"${WEBCORE_DIR}/platform/spi/ios"
"${WEBCORE_DIR}/platform/spi/mac"
"${WEBCORE_DIR}/plugins/mac"
- "${WTF_DIR}"
)
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (209664 => 209665)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -8,7 +8,6 @@
"${WEBKIT_LIBRARIES_DIR}/include"
"${WEBKIT_LIBRARIES_DIR}/include/SQLite"
"${WEBKIT_LIBRARIES_DIR}/include/zlib"
- "${_javascript_CORE_DIR}/wtf/text"
"${WEBCORE_DIR}/loader/archive/cf"
"${WEBCORE_DIR}/platform/cf"
"${WEBCORE_DIR}/platform/graphics/cairo"
Modified: trunk/Source/WebKit/CMakeLists.txt (209664 => 209665)
--- trunk/Source/WebKit/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -17,13 +17,8 @@
)
set(WebKit_INCLUDE_DIRECTORIES
- Storage
- WebCoreSupport
-
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_SOURCE_DIR}/Source"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+ "${WEBKIT_DIR}/Storage"
+ "${WEBKIT_DIR}/WebCoreSupport"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
Modified: trunk/Source/WebKit/ChangeLog (209664 => 209665)
--- trunk/Source/WebKit/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,18 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+
2016-12-05 Csaba Osztrogonác <o...@webkit.org>
Unreviewed cmake buildfix after r209252.
Modified: trunk/Source/WebKit/PlatformMac.cmake (209664 => 209665)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -5,44 +5,7 @@
link_directories(../../WebKitLibraries)
list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_WEBCORE_DIR}"
"${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
- "${_javascript_CORE_DIR}"
- "${_javascript_CORE_DIR}/dfg"
- "${WEBCORE_DIR}/accessibility/mac"
- "${WEBCORE_DIR}/bridge"
- "${WEBCORE_DIR}/bridge/jsc"
- "${WEBCORE_DIR}/bridge/objc"
- "${WEBCORE_DIR}/ForwardingHeaders/inspector"
- "${WEBCORE_DIR}/html/track"
- "${WEBCORE_DIR}/loader/archive/cf"
- "${WEBCORE_DIR}/loader/cf"
- "${WEBCORE_DIR}/loader/mac"
- "${WEBCORE_DIR}/page/cocoa"
- "${WEBCORE_DIR}/page/mac"
- "${WEBCORE_DIR}/platform"
- "${WEBCORE_DIR}/platform/cf"
- "${WEBCORE_DIR}/platform/cocoa"
- "${WEBCORE_DIR}/platform/graphics/avfoundation"
- "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
- "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
- "${WEBCORE_DIR}/platform/graphics/ca"
- "${WEBCORE_DIR}/platform/graphics/ca/mac"
- "${WEBCORE_DIR}/platform/graphics/cocoa"
- "${WEBCORE_DIR}/platform/graphics/cg"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/mac"
- "${WEBCORE_DIR}/platform/mac"
- "${WEBCORE_DIR}/platform/network/cocoa"
- "${WEBCORE_DIR}/platform/network/cf"
- "${WEBCORE_DIR}/platform/network/mac"
- "${WEBCORE_DIR}/platform/text/cf"
- "${WEBCORE_DIR}/platform/text/mac"
- "${WEBCORE_DIR}/plugins/mac"
- "${WEBCORE_DIR}/rendering/shapes"
- "${WTF_DIR}"
../../WebKitLibraries
)
Modified: trunk/Source/WebKit/PlatformWin.cmake (209664 => 209665)
--- trunk/Source/WebKit/PlatformWin.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -52,13 +52,11 @@
"${CMAKE_BINARY_DIR}/../include/private"
"${CMAKE_BINARY_DIR}/../include/private/_javascript_Core"
"${CMAKE_BINARY_DIR}/../include/private/WebCore"
- win
- win/plugins
- win/WebCoreSupport
- "${WEBKIT_DIR}/.."
+ "${WEBKIT_DIR}/win"
+ "${WEBKIT_DIR}/win/plugins"
+ "${WEBKIT_DIR}/win/WebCoreSupport"
"${DERIVED_SOURCES_WEBKIT_DIR}/include"
"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
- "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
Modified: trunk/Source/WebKit2/CMakeLists.txt (209664 => 209665)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,7 +1,6 @@
set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
set(WebKit2_INCLUDE_DIRECTORIES
- "${_javascript_CORE_DIR}/llint"
"${WEBKIT2_DIR}"
"${WEBKIT2_DIR}/DatabaseProcess"
"${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
@@ -75,99 +74,8 @@
"${WEBKIT2_DIR}/WebProcess/UserContent"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
"${WEBKIT2_DIR}/WebProcess/WebPage"
- "${WEBCORE_DIR}"
- "${WEBCORE_DIR}/Modules/indexeddb"
- "${WEBCORE_DIR}/Modules/indexeddb/client"
- "${WEBCORE_DIR}/Modules/indexeddb/server"
- "${WEBCORE_DIR}/Modules/indexeddb/shared"
- "${WEBCORE_DIR}/Modules/mediastream"
- "${WEBCORE_DIR}/Modules/networkinfo"
- "${WEBCORE_DIR}/Modules/notifications"
- "${WEBCORE_DIR}/Modules/streams"
- "${WEBCORE_DIR}/Modules/vibration"
- "${WEBCORE_DIR}/Modules/webdatabase"
- "${WEBCORE_DIR}/accessibility"
- "${WEBCORE_DIR}/bindings/generic"
- "${WEBCORE_DIR}/bindings/js"
- "${WEBCORE_DIR}/bindings"
- "${WEBCORE_DIR}/bridge"
- "${WEBCORE_DIR}/bridge/jsc"
- "${WEBCORE_DIR}/contentextensions"
- "${WEBCORE_DIR}/crypto"
- "${WEBCORE_DIR}/crypto/algorithms"
- "${WEBCORE_DIR}/crypto/keys"
- "${WEBCORE_DIR}/crypto/parameters"
- "${WEBCORE_DIR}/css"
- "${WEBCORE_DIR}/css/parser"
- "${WEBCORE_DIR}/dom"
- "${WEBCORE_DIR}/dom/default"
- "${WEBCORE_DIR}/editing"
- "${WEBCORE_DIR}/fileapi"
- "${WEBCORE_DIR}/history"
- "${WEBCORE_DIR}/html"
- "${WEBCORE_DIR}/html/canvas"
- "${WEBCORE_DIR}/html/shadow"
- "${WEBCORE_DIR}/html/track"
- "${WEBCORE_DIR}/inspector"
- "${WEBCORE_DIR}/loader"
- "${WEBCORE_DIR}/loader/archive"
- "${WEBCORE_DIR}/loader/icon"
- "${WEBCORE_DIR}/loader/cache"
- "${WEBCORE_DIR}/page"
- "${WEBCORE_DIR}/page/animation"
- "${WEBCORE_DIR}/page/csp"
- "${WEBCORE_DIR}/page/scrolling"
- "${WEBCORE_DIR}/platform"
- "${WEBCORE_DIR}/platform/animation"
- "${WEBCORE_DIR}/platform/audio"
- "${WEBCORE_DIR}/platform/gamepad"
- "${WEBCORE_DIR}/platform/graphics"
- "${WEBCORE_DIR}/platform/graphics/filters"
- "${WEBCORE_DIR}/platform/graphics/harfbuzz"
- "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
- "${WEBCORE_DIR}/platform/graphics/surfaces"
- "${WEBCORE_DIR}/platform/graphics/texmap"
- "${WEBCORE_DIR}/platform/graphics/transforms"
- "${WEBCORE_DIR}/platform/mediastream"
- "${WEBCORE_DIR}/platform/network"
- "${WEBCORE_DIR}/platform/spi/cf"
- "${WEBCORE_DIR}/platform/sql"
- "${WEBCORE_DIR}/platform/text"
- "${WEBCORE_DIR}/plugins"
- "${WEBCORE_DIR}/rendering"
- "${WEBCORE_DIR}/rendering/line"
- "${WEBCORE_DIR}/rendering/shapes"
- "${WEBCORE_DIR}/rendering/style"
- "${WEBCORE_DIR}/storage"
- "${WEBCORE_DIR}/style"
- "${WEBCORE_DIR}/svg"
- "${WEBCORE_DIR}/svg/graphics"
- "${WEBCORE_DIR}/svg/properties"
- "${WEBCORE_DIR}/workers"
- "${_javascript_CORE_DIR}"
- "${_javascript_CORE_DIR}/ForwardingHeaders"
- "${_javascript_CORE_DIR}/API"
- "${_javascript_CORE_DIR}/assembler"
- "${_javascript_CORE_DIR}/bytecode"
- "${_javascript_CORE_DIR}/bytecompiler"
- "${_javascript_CORE_DIR}/collector/handles"
- "${_javascript_CORE_DIR}/dfg"
- "${_javascript_CORE_DIR}/disassembler"
- "${_javascript_CORE_DIR}/domjit"
- "${_javascript_CORE_DIR}/heap"
- "${_javascript_CORE_DIR}/interpreter"
- "${_javascript_CORE_DIR}/jit"
- "${_javascript_CORE_DIR}/parser"
- "${_javascript_CORE_DIR}/profiler"
- "${_javascript_CORE_DIR}/runtime"
- "${WTF_DIR}"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- "${DERIVED_SOURCES_WEBCORE_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}/include"
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_SOURCE_DIR}/Source"
"${CMAKE_SOURCE_DIR}/WebKitLibraries"
)
Modified: trunk/Source/WebKit2/ChangeLog (209664 => 209665)
--- trunk/Source/WebKit2/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,19 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+
2016-12-10 Antti Koivisto <an...@apple.com>
CrashTracer: com.apple.WebKit.Networking at WTF::ThreadSafeRefCounted<WebKit::NetworkCache::IOChannel>::deref
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (209664 => 209665)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -231,14 +231,6 @@
)
list(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/efl"
- "${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/efl"
- "${WEBCORE_DIR}/platform/graphics/freetype"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/x11"
- "${WEBCORE_DIR}/platform/network/soup"
- "${WEBCORE_DIR}/platform/text/enchant"
"${WEBKIT2_DIR}/DatabaseProcess/unix"
"${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
"${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
@@ -274,9 +266,6 @@
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
"${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
- "${WTF_DIR}/wtf/efl"
- "${WTF_DIR}/wtf/glib"
- "${WTF_DIR}"
"${WEBKIT2_DIR}"
)
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (209664 => 209665)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -828,14 +828,6 @@
list(APPEND WebKit2_INCLUDE_DIRECTORIES
"${WEBKIT2_DIR}/PluginProcess/unix"
- "${WEBCORE_DIR}/platform/cairo"
- "${WEBCORE_DIR}/platform/gtk"
- "${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/freetype"
- "${WEBCORE_DIR}/platform/graphics/opentype"
- "${WEBCORE_DIR}/platform/graphics/x11"
- "${WEBCORE_DIR}/platform/network/soup"
- "${WEBCORE_DIR}/platform/text/enchant"
"${WEBKIT2_DIR}/DatabaseProcess/unix"
"${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
"${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
@@ -872,9 +864,6 @@
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
"${WEBKIT2_DIR}/WebProcess/WebPage/atk"
"${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
- "${WTF_DIR}/wtf/gtk"
- "${WTF_DIR}/wtf/glib"
- "${WTF_DIR}"
)
list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
@@ -1192,7 +1181,6 @@
WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
)
list(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
"${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
"${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
"${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
@@ -1211,7 +1199,6 @@
"${WEBKIT2_DIR}/UIProcess/API/C"
"${WEBKIT2_DIR}/WebProcess/InjectedBundle"
"${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
- "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_DIR}/InjectedBundle"
"${FORWARDING_HEADERS_DIR}"
"${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
Modified: trunk/Source/WebKit2/PlatformMac.cmake (209664 => 209665)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -372,20 +372,6 @@
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
list(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/icu"
- "${WEBCORE_DIR}/editing/cocoa"
- "${WEBCORE_DIR}/editing/mac"
- "${WEBCORE_DIR}/platform/cf"
- "${WEBCORE_DIR}/platform/cocoa"
- "${WEBCORE_DIR}/platform/graphics/cocoa"
- "${WEBCORE_DIR}/platform/mac"
- "${WEBCORE_DIR}/platform/network/cf"
- "${WEBCORE_DIR}/platform/network/cocoa"
- "${WEBCORE_DIR}/platform/spi/cocoa"
- "${WEBCORE_DIR}/platform/spi/mac"
- "${WEBCORE_DIR}/platform/graphics/ca"
- "${WEBCORE_DIR}/platform/graphics/cg"
- "${WEBCORE_DIR}/platform/graphics/opentype"
"${WEBKIT2_DIR}/NetworkProcess/cocoa"
"${WEBKIT2_DIR}/NetworkProcess/mac"
"${WEBKIT2_DIR}/PluginProcess/mac"
@@ -423,19 +409,9 @@
"${WEBKIT2_DIR}/WebProcess/WebPage/Cocoa"
"${WEBKIT2_DIR}/WebProcess/WebPage/mac"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
)
-# This is needed because of a naming conflict with DiagnosticLoggingClient.h.
-# FIXME: Rename one of the DiagnosticLoggingClient headers.
-list(REMOVE_ITEM WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/page"
-)
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/page"
-)
-
set(XPCService_SOURCES
Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
Modified: trunk/Source/cmake/WebKitMacros.cmake (209664 => 209665)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -292,12 +292,12 @@
endmacro()
macro(WEBKIT_FRAMEWORK _target)
- include_directories(${${_target}_INCLUDE_DIRECTORIES})
include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
add_library(${_target} ${${_target}_LIBRARY_TYPE}
${${_target}_HEADERS}
${${_target}_SOURCES}
)
+ target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
target_link_libraries(${_target} ${${_target}_LIBRARIES})
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
Modified: trunk/Tools/ChangeLog (209664 => 209665)
--- trunk/Tools/ChangeLog 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,3 +1,29 @@
+2016-12-10 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
+ https://bugs.webkit.org/show_bug.cgi?id=165686
+
+ Reviewed by Michael Catanzaro.
+
+ This change reduces duplication of include path lists between modules,
+ and reduces future need for fixes like r209605 (broken build because of
+ WebCore header suddenly becoming used in WebKit2).
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformMac.cmake:
+ * ImageDiff/CMakeLists.txt:
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * MiniBrowser/mac/CMakeLists.txt:
+ * MiniBrowser/win/CMakeLists.txt:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformEfl.cmake:
+ * TestWebKitAPI/PlatformJSCOnly.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+ * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformMac.cmake:
+
2016-12-09 Csaba Osztrogonác <o...@webkit.org>
Unreviewed buildfix after r209630.
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -26,58 +26,11 @@
)
set(DumpRenderTree_INCLUDE_DIRECTORIES
- ${WEBCORE_DIR}
- ${WEBCORE_DIR}/bindings
- ${WEBCORE_DIR}/bridge
- ${WEBCORE_DIR}/bridge/jsc
- ${WEBCORE_DIR}/css
- ${WEBCORE_DIR}/dom
- ${WEBCORE_DIR}/editing
- ${WEBCORE_DIR}/history
- ${WEBCORE_DIR}/html
- ${WEBCORE_DIR}/inspector
- ${WEBCORE_DIR}/loader
- ${WEBCORE_DIR}/loader/cache
- ${WEBCORE_DIR}/loader/icon
- ${WEBCORE_DIR}/page
- ${WEBCORE_DIR}/page/animation
- ${WEBCORE_DIR}/platform
- ${WEBCORE_DIR}/platform/animation
- ${WEBCORE_DIR}/platform/graphics
- ${WEBCORE_DIR}/platform/graphics/transforms
- ${WEBCORE_DIR}/platform/network
- ${WEBCORE_DIR}/platform/text
- ${WEBCORE_DIR}/plugins
- ${WEBCORE_DIR}/rendering
- ${WEBCORE_DIR}/rendering/shapes
- ${WEBCORE_DIR}/rendering/style
- ${_javascript_CORE_DIR}
- ${_javascript_CORE_DIR}/API
- ${_javascript_CORE_DIR}/assembler
- ${_javascript_CORE_DIR}/bytecode
- ${_javascript_CORE_DIR}/dfg
- ${_javascript_CORE_DIR}/disassembler
- ${_javascript_CORE_DIR}/domjit
- ${_javascript_CORE_DIR}/heap
- ${_javascript_CORE_DIR}/interpreter
- ${_javascript_CORE_DIR}/jit
- ${_javascript_CORE_DIR}/llint
- ${_javascript_CORE_DIR}/parser
- ${_javascript_CORE_DIR}/profiler
- ${_javascript_CORE_DIR}/runtime
- ${_javascript_CORE_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
${DERIVED_SOURCES_DIR}/DumpRenderTree
${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings
${TOOLS_DIR}/DumpRenderTree
- ${WTF_DIR}
${CMAKE_SOURCE_DIR}/Source
- ${CMAKE_BINARY_DIR}
- ${DERIVED_SOURCES_DIR}
- ${DERIVED_SOURCES_WEBCORE_DIR}
- ${WEBCORE_DIR}/bindings/js
${WEBCORE_DIR}/testing/js
)
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (209664 => 209665)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -44,7 +44,6 @@
${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit
${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy
- ${WTF_DIR}/icu
)
# Common ${TestNetscapePlugIn_SOURCES} from CMakeLists.txt are C++ source files.
Modified: trunk/Tools/ImageDiff/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/ImageDiff/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/ImageDiff/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,10 +1,5 @@
set(IMAGE_DIFF_DIR "${TOOLS_DIR}/ImageDiff")
-set(IMAGE_DIFF_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
- ${WTF_DIR}
-)
-
set(IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES "")
set(IMAGE_DIFF_LIBRARIES
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -21,7 +21,6 @@
)
set(MiniBrowser_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
${DERIVED_SOURCES_MINIBROWSER_DIR}
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -16,9 +16,7 @@
)
set(MiniBrowser_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Source
- ${DERIVED_SOURCES_DIR}
${DERIVED_SOURCES_DIR}/ForwardingHeaders
${FORWARDING_HEADERS_DIR}
${MINIBROWSER_DIR}
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -1,7 +1,6 @@
set(MiniBrowser_INCLUDE_DIRECTORIES
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
- "${WTF_DIR}"
"${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
)
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -99,25 +99,8 @@
${TESTWEBKITAPI_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Source
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
- ${DERIVED_SOURCES_WEBCORE_DIR}
${_javascript_CORE_DIR}
- ${_javascript_CORE_DIR}/API
- ${_javascript_CORE_DIR}/ForwardingHeaders
${THIRDPARTY_DIR}/gtest/include
- ${WEBCORE_DIR}/css
- ${WEBCORE_DIR}/css/parser
- ${WEBCORE_DIR}/dom
- ${WEBCORE_DIR}/editing
- ${WEBCORE_DIR}/loader/cache
- ${WEBCORE_DIR}/page
- ${WEBCORE_DIR}/platform
- ${WEBCORE_DIR}/platform/animation
- ${WEBCORE_DIR}/platform/graphics
- ${WEBCORE_DIR}/platform/text
- ${WEBCORE_DIR}/platform/network
- ${WEBCORE_DIR}/platform/network/soup
- ${WEBCORE_DIR}/rendering/style
${WEBKIT2_DIR}/Platform/IPC
${WEBKIT2_DIR}/Shared
${WEBKIT2_DIR}/Shared/API
@@ -127,7 +110,6 @@
${WEBKIT2_DIR}/UIProcess/API
${WEBKIT2_DIR}/WebProcess/InjectedBundle
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
- ${WTF_DIR}
)
if (ENABLE_WEBKIT2)
@@ -222,6 +204,8 @@
${TESTWEBKITAPI_DIR}/TestsController.cpp
)
+ target_link_libraries(TestWebKitAPIBase ${test_webkit2_api_LIBRARIES})
+
add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
foreach (testName ${test_webkit2_api_BINARIES})
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (209664 => 209665)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -9,7 +9,6 @@
include_directories(
${DERIVED_SOURCES_WEBKIT2_DIR}/include
- ${WTF_DIR}/wtf/efl
${WEBKIT2_DIR}/UIProcess/API/C/CoordinatedGraphics
${WEBKIT2_DIR}/UIProcess/API/C/soup
${WEBKIT2_DIR}/UIProcess/API/C/efl
Modified: trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake (209664 => 209665)
--- trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -3,7 +3,6 @@
include_directories(
${DERIVED_SOURCES_DIR}/ForwardingHeaders
- "${WTF_DIR}/icu"
)
if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (209664 => 209665)
--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -3,7 +3,6 @@
include_directories(
${DERIVED_SOURCES_DIR}/ForwardingHeaders
- "${WTF_DIR}/icu"
)
set(test_main_SOURCES
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -12,10 +12,8 @@
)
include_directories(
- ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Source
${CMAKE_SOURCE_DIR}/Source/WTF
- ${DERIVED_SOURCES_DIR}
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (209664 => 209665)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
@@ -35,16 +35,6 @@
${WEBKIT_TESTRUNNER_DIR}/InjectedBundle/atk
${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
${WEBKIT_TESTRUNNER_BINDINGS_DIR}
- ${_javascript_CORE_DIR}
- ${_javascript_CORE_DIR}/ForwardingHeaders
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
- ${WEBCORE_DIR}/editing
- ${WEBCORE_DIR}/platform
- ${WEBCORE_DIR}/platform/graphics
- ${WEBCORE_DIR}/platform/graphics/harfbuzz
- ${WEBCORE_DIR}/platform/graphics/harfbuzz/ng
- ${WEBCORE_DIR}/platform/network
- ${WEBCORE_DIR}/platform/text
${WEBCORE_DIR}/testing/js
${WEBKIT2_DIR}/Platform/IPC
${WEBKIT2_DIR}/Shared
@@ -54,10 +44,8 @@
${WEBKIT2_DIR}/UIProcess/API/C/soup
${WEBKIT2_DIR}/WebProcess/InjectedBundle
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
- ${WTF_DIR}
${DERIVED_SOURCES_DIR}/InjectedBundle
${DERIVED_SOURCES_DIR}/UIScriptContext
- ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Source
)
Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (209664 => 209665)
--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -15,7 +15,6 @@
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${FORWARDING_HEADERS_DIR}
- ${WTF_DIR}/wtf/glib
)
list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (209664 => 209665)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-12-10 18:04:09 UTC (rev 209664)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2016-12-10 18:16:04 UTC (rev 209665)
@@ -28,7 +28,6 @@
${WEBKIT_TESTRUNNER_DIR}/cocoa
${WEBKIT_TESTRUNNER_DIR}/mac
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
- ${WTF_DIR}/icu
${CMAKE_SOURCE_DIR}/WebKitLibraries
)
