[cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
authorannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Dec 2016 18:16:04 +0000 (18:16 +0000)
committerannulen@yandex.ru <annulen@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Dec 2016 18:16:04 +0000 (18:16 +0000)
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:

Source/JavaScriptCore:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformJSCOnly.cmake:
* PlatformMac.cmake:

Source/ThirdParty:

* gtest/CMakeLists.txt:

Source/WebCore:

No new tests needed.

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWinCairo.cmake:

Source/WebKit:

* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:

Source/WebKit2:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:

Tools:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

40 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformEfl.cmake
Source/JavaScriptCore/PlatformGTK.cmake
Source/JavaScriptCore/PlatformJSCOnly.cmake
Source/JavaScriptCore/PlatformMac.cmake
Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/PlatformWinCairo.cmake
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit/PlatformWin.cmake
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/PlatformMac.cmake
Source/cmake/WebKitMacros.cmake
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/DumpRenderTree/PlatformMac.cmake
Tools/ImageDiff/CMakeLists.txt
Tools/MiniBrowser/gtk/CMakeLists.txt
Tools/MiniBrowser/mac/CMakeLists.txt
Tools/MiniBrowser/win/CMakeLists.txt
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformEfl.cmake
Tools/TestWebKitAPI/PlatformJSCOnly.cmake
Tools/TestWebKitAPI/PlatformMac.cmake
Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
Tools/WebKitTestRunner/CMakeLists.txt
Tools/WebKitTestRunner/PlatformGTK.cmake
Tools/WebKitTestRunner/PlatformMac.cmake

index 68a854d..1cfadb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <bfulgham@apple.com>
 
         [Win] Apple build is using incorrect ICU library (if present)
index e548380..84b5db6 100644 (file)
@@ -3,7 +3,6 @@ include(WebKitCommon)
 set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
 
 set(JavaScriptCore_INCLUDE_DIRECTORIES
-    "${CMAKE_BINARY_DIR}"
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/.."
     "${JAVASCRIPTCORE_DIR}/API"
@@ -37,7 +36,6 @@ set(JavaScriptCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/wasm"
     "${JAVASCRIPTCORE_DIR}/wasm/js"
     "${JAVASCRIPTCORE_DIR}/yarr"
-    "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
@@ -1476,6 +1474,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${JavaScriptCore_FORWARDING_HEADERS_FILES})
 
+target_include_directories(LLIntOffsetsExtractor PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES})
 
 add_subdirectory(shell)
 
index 8524268..23ca6c0 100644 (file)
@@ -1,3 +1,20 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <msaboff@apple.com>
 
         Unreviewed build fix for the CLOOP after r209653
index 1ba53b9..40ee4dd 100644 (file)
@@ -1,8 +1,3 @@
-list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
-    "${WTF_DIR}"
-    "${WTF_DIR}/wtf/efl"
-)
-
 list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
     ${ECORE_EVAS_INCLUDE_DIRS}
     ${ECORE_IMF_INCLUDE_DIRS}
index 4791aba..2c62eb0 100644 (file)
@@ -1,9 +1,5 @@
 set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
 
-list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
-    "${WTF_DIR}"
-)
-
 configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
 configure_file(JavaScriptCore.gir.in ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @ONLY)
 
index 9bca07b..7b1e732 100644 (file)
@@ -1,9 +1,5 @@
 add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
 
-list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
-    "${WTF_DIR}"
-)
-
 if (USE_GLIB)
     list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
         ${GLIB_INCLUDE_DIRS}
index 8717c4a..2e6b15b 100644 (file)
@@ -24,7 +24,6 @@ list(APPEND JavaScriptCore_LIBRARIES
 )
 
 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
-    ${WTF_DIR}
     ${JAVASCRIPTCORE_DIR}/disassembler/udis86
     ${JAVASCRIPTCORE_DIR}/icu
 )
index d39dbe9..2661d09 100644 (file)
@@ -1,3 +1,16 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <ap@apple.com>
 
         Correct SDKROOT values in xcconfig files
index 51c8f91..055781f 100644 (file)
@@ -9,9 +9,7 @@ set(GTEST_INCLUDE_DIRECTORIES
     "${GTEST_DIR}"
     "${GTEST_DIR}/include"
     "${JAVASCRIPTCORE_DIR}"
-    "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
-    "${WTF_DIR}"
 )
 
 set(GTEST_SOURCES
index f0331ce..840f345 100644 (file)
@@ -113,11 +113,8 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${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 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
 endif ()
 
 if (ENABLE_WEB_REPLAY)
-    list(APPEND WebCore_INCLUDE_DIRECTORIES
-        "${JAVASCRIPTCORE_DIR}/inspector"
-        "${JAVASCRIPTCORE_DIR}/replay"
-    )
-
     set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json ${JAVASCRIPTCORE_DIR}/replay/JSInputs.json)
     add_custom_command(
         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
@@ -3876,7 +3868,9 @@ endif ()
 # files on OS X.
 add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
 set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
-add_dependencies(WebCoreDerivedSources JavaScriptCore 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 @@ if (MSVC)
     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)
index 0ec30c4..886255f 100644 (file)
@@ -1,3 +1,22 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <rniwa@webkit.org>
 
         Replace isUnclosedNode by isClosedShadowHidden
index c9cef4c..f3ae89b 100644 (file)
@@ -4,26 +4,6 @@ include(platform/Linux.cmake)
 include(platform/TextureMapper.cmake)
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
-    "${JAVASCRIPTCORE_DIR}"
-    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
-    "${JAVASCRIPTCORE_DIR}/API"
-    "${JAVASCRIPTCORE_DIR}/assembler"
-    "${JAVASCRIPTCORE_DIR}/bytecode"
-    "${JAVASCRIPTCORE_DIR}/bytecompiler"
-    "${JAVASCRIPTCORE_DIR}/dfg"
-    "${JAVASCRIPTCORE_DIR}/disassembler"
-    "${JAVASCRIPTCORE_DIR}/domjit"
-    "${JAVASCRIPTCORE_DIR}/heap"
-    "${JAVASCRIPTCORE_DIR}/debugger"
-    "${JAVASCRIPTCORE_DIR}/interpreter"
-    "${JAVASCRIPTCORE_DIR}/jit"
-    "${JAVASCRIPTCORE_DIR}/llint"
-    "${JAVASCRIPTCORE_DIR}/parser"
-    "${JAVASCRIPTCORE_DIR}/profiler"
-    "${JAVASCRIPTCORE_DIR}/runtime"
-    "${JAVASCRIPTCORE_DIR}/yarr"
     "${THIRDPARTY_DIR}/ANGLE/"
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/editing/atk"
@@ -49,8 +29,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/network/soup"
     "${WEBCORE_DIR}/platform/text/efl"
     "${WEBCORE_DIR}/plugins/efl"
-    "${WTF_DIR}"
-    "${WTF_DIR}/wtf/efl"
 )
 
 list(APPEND WebCore_SOURCES
index 7ef36cd..6242162 100644 (file)
@@ -9,26 +9,6 @@ endif ()
 set(WebCore_OUTPUT_NAME WebCoreGTK)
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
-    "${JAVASCRIPTCORE_DIR}"
-    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
-    "${JAVASCRIPTCORE_DIR}/API"
-    "${JAVASCRIPTCORE_DIR}/assembler"
-    "${JAVASCRIPTCORE_DIR}/bytecode"
-    "${JAVASCRIPTCORE_DIR}/bytecompiler"
-    "${JAVASCRIPTCORE_DIR}/dfg"
-    "${JAVASCRIPTCORE_DIR}/disassembler"
-    "${JAVASCRIPTCORE_DIR}/domjit"
-    "${JAVASCRIPTCORE_DIR}/heap"
-    "${JAVASCRIPTCORE_DIR}/debugger"
-    "${JAVASCRIPTCORE_DIR}/interpreter"
-    "${JAVASCRIPTCORE_DIR}/jit"
-    "${JAVASCRIPTCORE_DIR}/llint"
-    "${JAVASCRIPTCORE_DIR}/parser"
-    "${JAVASCRIPTCORE_DIR}/profiler"
-    "${JAVASCRIPTCORE_DIR}/runtime"
-    "${JAVASCRIPTCORE_DIR}/yarr"
     "${THIRDPARTY_DIR}/ANGLE/"
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/accessibility/atk"
@@ -56,7 +36,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${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 @@ target_link_libraries(WebCorePlatformGTK
 include_directories(
     ${WebCore_INCLUDE_DIRECTORIES}
     "${WEBCORE_DIR}/bindings/gobject/"
-    "${DERIVED_SOURCES_DIR}"
 )
 
 include_directories(SYSTEM
index dd4212b..37bdfc3 100644 (file)
@@ -68,9 +68,6 @@ endif ()
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
-    "${JAVASCRIPTCORE_DIR}/replay"
     "${THIRDPARTY_DIR}/ANGLE"
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/accessibility/mac"
@@ -126,7 +123,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/spi/ios"
     "${WEBCORE_DIR}/platform/spi/mac"
     "${WEBCORE_DIR}/plugins/mac"
-    "${WTF_DIR}"
 )
 
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
index 953922d..7e1deb2 100644 (file)
@@ -8,7 +8,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBKIT_LIBRARIES_DIR}/include"
     "${WEBKIT_LIBRARIES_DIR}/include/SQLite"
     "${WEBKIT_LIBRARIES_DIR}/include/zlib"
-    "${JAVASCRIPTCORE_DIR}/wtf/text"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/platform/cf"
     "${WEBCORE_DIR}/platform/graphics/cairo"
index 8814ae4..d69a79f 100644 (file)
@@ -17,13 +17,8 @@ set(WebKit_SOURCES
 )
 
 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/JavaScriptCore"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
index 7747542..8be3b6f 100644 (file)
@@ -1,3 +1,18 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <ossy@webkit.org>
 
         Unreviewed cmake buildfix after r209252.
index 39071d2..0d0ec2b 100644 (file)
@@ -5,44 +5,7 @@ add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Fram
 link_directories(../../WebKitLibraries)
 
 list(APPEND WebKit_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_DIR}"
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
-    "${DERIVED_SOURCES_WEBCORE_DIR}"
     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
-    "${JAVASCRIPTCORE_DIR}"
-    "${JAVASCRIPTCORE_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
 )
 
index 7079152..94d2180 100644 (file)
@@ -52,13 +52,11 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}/../include/private"
     "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
     "${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"
index aa5935e..f9a67af 100644 (file)
@@ -1,7 +1,6 @@
 set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
 
 set(WebKit2_INCLUDE_DIRECTORIES
-    "${JAVASCRIPTCORE_DIR}/llint"
     "${WEBKIT2_DIR}"
     "${WEBKIT2_DIR}/DatabaseProcess"
     "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
@@ -75,99 +74,8 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${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"
-    "${JAVASCRIPTCORE_DIR}"
-    "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
-    "${JAVASCRIPTCORE_DIR}/API"
-    "${JAVASCRIPTCORE_DIR}/assembler"
-    "${JAVASCRIPTCORE_DIR}/bytecode"
-    "${JAVASCRIPTCORE_DIR}/bytecompiler"
-    "${JAVASCRIPTCORE_DIR}/collector/handles"
-    "${JAVASCRIPTCORE_DIR}/dfg"
-    "${JAVASCRIPTCORE_DIR}/disassembler"
-    "${JAVASCRIPTCORE_DIR}/domjit"
-    "${JAVASCRIPTCORE_DIR}/heap"
-    "${JAVASCRIPTCORE_DIR}/interpreter"
-    "${JAVASCRIPTCORE_DIR}/jit"
-    "${JAVASCRIPTCORE_DIR}/parser"
-    "${JAVASCRIPTCORE_DIR}/profiler"
-    "${JAVASCRIPTCORE_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"
 )
 
index 49446da..56356a7 100644 (file)
@@ -1,3 +1,19 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <antti@apple.com>
 
         CrashTracer: com.apple.WebKit.Networking at WTF::ThreadSafeRefCounted<WebKit::NetworkCache::IOChannel>::deref
index 9944ada..9270500 100644 (file)
@@ -231,14 +231,6 @@ list(APPEND WebKit2_MESSAGES_IN_FILES
 )
 
 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 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${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}"
 )
 
index 5954b72..0a5e4d4 100644 (file)
@@ -828,14 +828,6 @@ list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
 
 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 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${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 @@ if (ENABLE_THREADED_COMPOSITOR)
         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 @@ include_directories(
     "${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}"
index 6f5fd38..bc63ffe 100644 (file)
@@ -372,20 +372,6 @@ list(APPEND WebKit2_SOURCES
 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 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${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
index 2a7251e..a987e4f 100644 (file)
@@ -292,12 +292,12 @@ macro(WEBKIT_WRAP_SOURCELIST)
 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}")
 
index 608d298..27fa9f5 100644 (file)
@@ -1,3 +1,29 @@
+2016-12-10  Konstantin Tokarev  <annulen@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  <ossy@webkit.org>
 
         Unreviewed buildfix after r209630.
index 33f5252..104b9d8 100644 (file)
@@ -26,58 +26,11 @@ set(DumpRenderTree_LIBRARIES
 )
 
 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
-    ${JAVASCRIPTCORE_DIR}
-    ${JAVASCRIPTCORE_DIR}/API
-    ${JAVASCRIPTCORE_DIR}/assembler
-    ${JAVASCRIPTCORE_DIR}/bytecode
-    ${JAVASCRIPTCORE_DIR}/dfg
-    ${JAVASCRIPTCORE_DIR}/disassembler
-    ${JAVASCRIPTCORE_DIR}/domjit
-    ${JAVASCRIPTCORE_DIR}/heap
-    ${JAVASCRIPTCORE_DIR}/interpreter
-    ${JAVASCRIPTCORE_DIR}/jit
-    ${JAVASCRIPTCORE_DIR}/llint
-    ${JAVASCRIPTCORE_DIR}/parser
-    ${JAVASCRIPTCORE_DIR}/profiler
-    ${JAVASCRIPTCORE_DIR}/runtime
-    ${JAVASCRIPTCORE_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
 )
 
index 5204e1c..98e48e5 100644 (file)
@@ -44,7 +44,6 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     ${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.
index b15443f..fdc584d 100644 (file)
@@ -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
index 0704bc6..e38bc6d 100644 (file)
@@ -21,7 +21,6 @@ set(MiniBrowser_SOURCES
 )
 
 set(MiniBrowser_INCLUDE_DIRECTORIES
-    ${CMAKE_BINARY_DIR}
     ${DERIVED_SOURCES_MINIBROWSER_DIR}
     ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
     ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
index 75ae7ce..9d5a068 100644 (file)
@@ -16,9 +16,7 @@ set(MiniBrowser_SOURCES
 )
 
 set(MiniBrowser_INCLUDE_DIRECTORIES
-    ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/Source
-    ${DERIVED_SOURCES_DIR}
     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
     ${FORWARDING_HEADERS_DIR}
     ${MINIBROWSER_DIR}
index df13dd4..4074b2c 100644 (file)
@@ -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"
 )
index 6bed8df..ea7a21e 100644 (file)
@@ -99,25 +99,8 @@ include_directories(
     ${TESTWEBKITAPI_DIR}
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/Source
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
-    ${DERIVED_SOURCES_WEBCORE_DIR}
     ${JAVASCRIPTCORE_DIR}
-    ${JAVASCRIPTCORE_DIR}/API
-    ${JAVASCRIPTCORE_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 @@ include_directories(
     ${WEBKIT2_DIR}/UIProcess/API
     ${WEBKIT2_DIR}/WebProcess/InjectedBundle
     ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
-    ${WTF_DIR}
 )
 
 if (ENABLE_WEBKIT2)
@@ -222,6 +204,8 @@ if (ENABLE_WEBKIT2)
         ${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})
index 952f417..e1c3f18 100644 (file)
@@ -9,7 +9,6 @@ set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersEflForTestWebKitAPI
 
 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
index e25c62f..9867960 100644 (file)
@@ -3,7 +3,6 @@ set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_D
 
 include_directories(
     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
-    "${WTF_DIR}/icu"
 )
 
 if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
index ff74593..76544bf 100644 (file)
@@ -3,7 +3,6 @@ set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_D
 
 include_directories(
     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
-    "${WTF_DIR}/icu"
 )
 
 set(test_main_SOURCES
index b0b4739..946774e 100644 (file)
@@ -12,10 +12,8 @@ add_definitions(
 )
 
 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}
index 8c98768..fb7d523 100644 (file)
@@ -35,16 +35,6 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
     ${WEBKIT_TESTRUNNER_DIR}/InjectedBundle/atk
     ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
     ${WEBKIT_TESTRUNNER_BINDINGS_DIR}
-    ${JAVASCRIPTCORE_DIR}
-    ${JAVASCRIPTCORE_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 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
     ${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
 )
 
index 1e8e701..af53e22 100644 (file)
@@ -15,7 +15,6 @@ list(APPEND WebKitTestRunner_SOURCES
 
 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${FORWARDING_HEADERS_DIR}
-    ${WTF_DIR}/wtf/glib
 )
 
 list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
index d97d108..2d7c19d 100644 (file)
@@ -28,7 +28,6 @@ list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${WEBKIT_TESTRUNNER_DIR}/cocoa
     ${WEBKIT_TESTRUNNER_DIR}/mac
     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
-    ${WTF_DIR}/icu
     ${CMAKE_SOURCE_DIR}/WebKitLibraries
 )