Changeset 209665 in webkit


Ignore:
Timestamp:
Dec 10, 2016 10:16:04 AM (7 years ago)
Author:
Konstantin Tokarev
Message:

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

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:
Location:
trunk
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r209138 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        * Source/cmake/WebKitMacros.cmake:
     13
    1142016-11-30  Brent Fulgham  <bfulgham@apple.com>
    215

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r209630 r209665  
    44
    55set(JavaScriptCore_INCLUDE_DIRECTORIES
    6     "${CMAKE_BINARY_DIR}"
    76    "${JAVASCRIPTCORE_DIR}"
    87    "${JAVASCRIPTCORE_DIR}/.."
    … …  
    3837    "${JAVASCRIPTCORE_DIR}/wasm/js"
    3938    "${JAVASCRIPTCORE_DIR}/yarr"
    40     "${DERIVED_SOURCES_DIR}"
    4139    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    4240    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    … …  
    14771475WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${JavaScriptCore_FORWARDING_HEADERS_FILES})
    14781476
     1477target_include_directories(LLIntOffsetsExtractor PRIVATE ${JavaScriptCore_INCLUDE_DIRECTORIES})
    14791478
    14801479add_subdirectory(shell)

  • trunk/Source/JavaScriptCore/ChangeLog

    r209663 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        * CMakeLists.txt:
     13        * PlatformEfl.cmake:
     14        * PlatformGTK.cmake:
     15        * PlatformJSCOnly.cmake:
     16        * PlatformMac.cmake:
     17
    1182016-12-10  Michael Saboff  <msaboff@apple.com>
    219

  • trunk/Source/JavaScriptCore/PlatformEfl.cmake

    r201711 r209665  
    1 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    2     "${WTF_DIR}"
    3     "${WTF_DIR}/wtf/efl"
    4 )
    5 
    61list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
    72    ${ECORE_EVAS_INCLUDE_DIRS}

  • trunk/Source/JavaScriptCore/PlatformGTK.cmake

    r197983 r209665  
    11set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
    2 
    3 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    4     "${WTF_DIR}"
    5 )
    62
    73configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)

  • trunk/Source/JavaScriptCore/PlatformJSCOnly.cmake

    r198086 r209665  
    11add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
    2 
    3 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    4     "${WTF_DIR}"
    5 )
    62
    73if (USE_GLIB)

  • trunk/Source/JavaScriptCore/PlatformMac.cmake

    r200568 r209665  
    2525
    2626list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    27     ${WTF_DIR}
    2827    ${JAVASCRIPTCORE_DIR}/disassembler/udis86
    2928    ${JAVASCRIPTCORE_DIR}/icu

  • trunk/Source/ThirdParty/ChangeLog

    r209434 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        * gtest/CMakeLists.txt:
     13
    1142016-12-06  Alexey Proskuryakov  <ap@apple.com>
    215

  • trunk/Source/ThirdParty/gtest/CMakeLists.txt

    r206437 r209665  
    1010    "${GTEST_DIR}/include"
    1111    "${JAVASCRIPTCORE_DIR}"
    12     "${DERIVED_SOURCES_DIR}"
    1312    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    14     "${WTF_DIR}"
    1513)
    1614

  • trunk/Source/WebCore/CMakeLists.txt

    r209612 r209665  
    114114    "${WEBCORE_DIR}/xml"
    115115    "${WEBCORE_DIR}/xml/parser"
    116     "${DERIVED_SOURCES_DIR}"
    117     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    118116    "${DERIVED_SOURCES_WEBCORE_DIR}"
    119117    "${CMAKE_SOURCE_DIR}/Source"
    120     "${CMAKE_BINARY_DIR}"
    121118)
    122119
    … …  
    34003397
    34013398if (ENABLE_WEB_REPLAY)
    3402     list(APPEND WebCore_INCLUDE_DIRECTORIES
    3403         "${JAVASCRIPTCORE_DIR}/inspector"
    3404         "${JAVASCRIPTCORE_DIR}/replay"
    3405     )
    3406 
    34073399    set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json ${JAVASCRIPTCORE_DIR}/replay/JSInputs.json)
    34083400    add_custom_command(
    … …  
    38773869add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
    38783870set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
    3879 add_dependencies(WebCoreDerivedSources JavaScriptCore WebCoreBindings)
     3871target_link_libraries(WebCoreDerivedSources ${WebCore_LIBRARIES})
     3872target_include_directories(WebCoreDerivedSources PUBLIC ${WebCore_INCLUDE_DIRECTORIES})
     3873add_dependencies(WebCoreDerivedSources WebCoreBindings)
    38803874if (NOT WIN32)
    38813875    list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
    … …  
    39063900endif ()
    39073901
    3908 include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
    39093902add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
    39103903add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
     3904target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
    39113905target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
    39123906

  • trunk/Source/WebCore/ChangeLog

    r209661 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        No new tests needed.
     13
     14        * CMakeLists.txt:
     15        * PlatformEfl.cmake:
     16        * PlatformGTK.cmake:
     17        * PlatformMac.cmake:
     18        * PlatformWinCairo.cmake:
     19
    1202016-12-10  Ryosuke Niwa  <rniwa@webkit.org>
    221

  • trunk/Source/WebCore/PlatformEfl.cmake

    r209390 r209665  
    55
    66list(APPEND WebCore_INCLUDE_DIRECTORIES
    7     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    8     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    9     "${JAVASCRIPTCORE_DIR}"
    10     "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    11     "${JAVASCRIPTCORE_DIR}/API"
    12     "${JAVASCRIPTCORE_DIR}/assembler"
    13     "${JAVASCRIPTCORE_DIR}/bytecode"
    14     "${JAVASCRIPTCORE_DIR}/bytecompiler"
    15     "${JAVASCRIPTCORE_DIR}/dfg"
    16     "${JAVASCRIPTCORE_DIR}/disassembler"
    17     "${JAVASCRIPTCORE_DIR}/domjit"
    18     "${JAVASCRIPTCORE_DIR}/heap"
    19     "${JAVASCRIPTCORE_DIR}/debugger"
    20     "${JAVASCRIPTCORE_DIR}/interpreter"
    21     "${JAVASCRIPTCORE_DIR}/jit"
    22     "${JAVASCRIPTCORE_DIR}/llint"
    23     "${JAVASCRIPTCORE_DIR}/parser"
    24     "${JAVASCRIPTCORE_DIR}/profiler"
    25     "${JAVASCRIPTCORE_DIR}/runtime"
    26     "${JAVASCRIPTCORE_DIR}/yarr"
    277    "${THIRDPARTY_DIR}/ANGLE/"
    288    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    … …  
    5030    "${WEBCORE_DIR}/platform/text/efl"
    5131    "${WEBCORE_DIR}/plugins/efl"
    52     "${WTF_DIR}"
    53     "${WTF_DIR}/wtf/efl"
    5432)
    5533

  • trunk/Source/WebCore/PlatformGTK.cmake

    r209390 r209665  
    1010
    1111list(APPEND WebCore_INCLUDE_DIRECTORIES
    12     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    13     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    14     "${JAVASCRIPTCORE_DIR}"
    15     "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    16     "${JAVASCRIPTCORE_DIR}/API"
    17     "${JAVASCRIPTCORE_DIR}/assembler"
    18     "${JAVASCRIPTCORE_DIR}/bytecode"
    19     "${JAVASCRIPTCORE_DIR}/bytecompiler"
    20     "${JAVASCRIPTCORE_DIR}/dfg"
    21     "${JAVASCRIPTCORE_DIR}/disassembler"
    22     "${JAVASCRIPTCORE_DIR}/domjit"
    23     "${JAVASCRIPTCORE_DIR}/heap"
    24     "${JAVASCRIPTCORE_DIR}/debugger"
    25     "${JAVASCRIPTCORE_DIR}/interpreter"
    26     "${JAVASCRIPTCORE_DIR}/jit"
    27     "${JAVASCRIPTCORE_DIR}/llint"
    28     "${JAVASCRIPTCORE_DIR}/parser"
    29     "${JAVASCRIPTCORE_DIR}/profiler"
    30     "${JAVASCRIPTCORE_DIR}/runtime"
    31     "${JAVASCRIPTCORE_DIR}/yarr"
    3212    "${THIRDPARTY_DIR}/ANGLE/"
    3313    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    … …  
    5737    "${WEBCORE_DIR}/platform/network/soup"
    5838    "${WEBCORE_DIR}/platform/text/gtk"
    59     "${WTF_DIR}"
    6039)
    6140
    … …  
    380359    ${WebCore_INCLUDE_DIRECTORIES}
    381360    "${WEBCORE_DIR}/bindings/gobject/"
    382     "${DERIVED_SOURCES_DIR}"
    383361)
    384362

  • trunk/Source/WebCore/PlatformMac.cmake

    r209614 r209665  
    6969list(APPEND WebCore_INCLUDE_DIRECTORIES
    7070    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    71     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    72     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    73     "${JAVASCRIPTCORE_DIR}/replay"
    7471    "${THIRDPARTY_DIR}/ANGLE"
    7572    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    … …  
    127124    "${WEBCORE_DIR}/platform/spi/mac"
    128125    "${WEBCORE_DIR}/plugins/mac"
    129     "${WTF_DIR}"
    130126)
    131127

  • trunk/Source/WebCore/PlatformWinCairo.cmake

    r206153 r209665  
    99    "${WEBKIT_LIBRARIES_DIR}/include/SQLite"
    1010    "${WEBKIT_LIBRARIES_DIR}/include/zlib"
    11     "${JAVASCRIPTCORE_DIR}/wtf/text"
    1211    "${WEBCORE_DIR}/loader/archive/cf"
    1312    "${WEBCORE_DIR}/platform/cf"

  • trunk/Source/WebKit/CMakeLists.txt

    r207831 r209665  
    1818
    1919set(WebKit_INCLUDE_DIRECTORIES
    20     Storage
    21     WebCoreSupport
    22 
    23     "${CMAKE_BINARY_DIR}"
    24     "${CMAKE_SOURCE_DIR}/Source"
    25     "${DERIVED_SOURCES_DIR}"
    26     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     20    "${WEBKIT_DIR}/Storage"
     21    "${WEBKIT_DIR}/WebCoreSupport"
    2722    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    2823    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"

  • trunk/Source/WebKit/ChangeLog

    r209315 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        * CMakeLists.txt:
     13        * PlatformMac.cmake:
     14        * PlatformWin.cmake:
     15
    1162016-12-05  Csaba Osztrogonác  <ossy@webkit.org>
    217

  • trunk/Source/WebKit/PlatformMac.cmake

    r209315 r209665  
    66
    77list(APPEND WebKit_INCLUDE_DIRECTORIES
    8     "${DERIVED_SOURCES_DIR}"
    9     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    10     "${DERIVED_SOURCES_WEBCORE_DIR}"
    118    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
    12     "${JAVASCRIPTCORE_DIR}"
    13     "${JAVASCRIPTCORE_DIR}/dfg"
    14     "${WEBCORE_DIR}/accessibility/mac"
    15     "${WEBCORE_DIR}/bridge"
    16     "${WEBCORE_DIR}/bridge/jsc"
    17     "${WEBCORE_DIR}/bridge/objc"
    18     "${WEBCORE_DIR}/ForwardingHeaders/inspector"
    19     "${WEBCORE_DIR}/html/track"
    20     "${WEBCORE_DIR}/loader/archive/cf"
    21     "${WEBCORE_DIR}/loader/cf"
    22     "${WEBCORE_DIR}/loader/mac"
    23     "${WEBCORE_DIR}/page/cocoa"
    24     "${WEBCORE_DIR}/page/mac"
    25     "${WEBCORE_DIR}/platform"
    26     "${WEBCORE_DIR}/platform/cf"
    27     "${WEBCORE_DIR}/platform/cocoa"
    28     "${WEBCORE_DIR}/platform/graphics/avfoundation"
    29     "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
    30     "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
    31     "${WEBCORE_DIR}/platform/graphics/ca"
    32     "${WEBCORE_DIR}/platform/graphics/ca/mac"
    33     "${WEBCORE_DIR}/platform/graphics/cocoa"
    34     "${WEBCORE_DIR}/platform/graphics/cg"
    35     "${WEBCORE_DIR}/platform/graphics/opentype"
    36     "${WEBCORE_DIR}/platform/graphics/mac"
    37     "${WEBCORE_DIR}/platform/mac"
    38     "${WEBCORE_DIR}/platform/network/cocoa"
    39     "${WEBCORE_DIR}/platform/network/cf"
    40     "${WEBCORE_DIR}/platform/network/mac"
    41     "${WEBCORE_DIR}/platform/text/cf"
    42     "${WEBCORE_DIR}/platform/text/mac"
    43     "${WEBCORE_DIR}/plugins/mac"
    44     "${WEBCORE_DIR}/rendering/shapes"
    45     "${WTF_DIR}"
    469    ../../WebKitLibraries
    4710)

  • trunk/Source/WebKit/PlatformWin.cmake

    r207308 r209665  
    5353    "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
    5454    "${CMAKE_BINARY_DIR}/../include/private/WebCore"
    55     win
    56     win/plugins
    57     win/WebCoreSupport
    58     "${WEBKIT_DIR}/.."
     55    "${WEBKIT_DIR}/win"
     56    "${WEBKIT_DIR}/win/plugins"
     57    "${WEBKIT_DIR}/win/WebCoreSupport"
    5958    "${DERIVED_SOURCES_WEBKIT_DIR}/include"
    6059    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
    61     "${DERIVED_SOURCES_DIR}"
    6260    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
    6361    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"

  • trunk/Source/WebKit2/CMakeLists.txt

    r209605 r209665  
    22
    33set(WebKit2_INCLUDE_DIRECTORIES
    4     "${JAVASCRIPTCORE_DIR}/llint"
    54    "${WEBKIT2_DIR}"
    65    "${WEBKIT2_DIR}/DatabaseProcess"
    … …  
    7675    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
    7776    "${WEBKIT2_DIR}/WebProcess/WebPage"
    78     "${WEBCORE_DIR}"
    79     "${WEBCORE_DIR}/Modules/indexeddb"
    80     "${WEBCORE_DIR}/Modules/indexeddb/client"
    81     "${WEBCORE_DIR}/Modules/indexeddb/server"
    82     "${WEBCORE_DIR}/Modules/indexeddb/shared"
    83     "${WEBCORE_DIR}/Modules/mediastream"
    84     "${WEBCORE_DIR}/Modules/networkinfo"
    85     "${WEBCORE_DIR}/Modules/notifications"
    86     "${WEBCORE_DIR}/Modules/streams"
    87     "${WEBCORE_DIR}/Modules/vibration"
    88     "${WEBCORE_DIR}/Modules/webdatabase"
    89     "${WEBCORE_DIR}/accessibility"
    90     "${WEBCORE_DIR}/bindings/generic"
    91     "${WEBCORE_DIR}/bindings/js"
    92     "${WEBCORE_DIR}/bindings"
    93     "${WEBCORE_DIR}/bridge"
    94     "${WEBCORE_DIR}/bridge/jsc"
    95     "${WEBCORE_DIR}/contentextensions"
    96     "${WEBCORE_DIR}/crypto"
    97     "${WEBCORE_DIR}/crypto/algorithms"
    98     "${WEBCORE_DIR}/crypto/keys"
    99     "${WEBCORE_DIR}/crypto/parameters"
    100     "${WEBCORE_DIR}/css"
    101     "${WEBCORE_DIR}/css/parser"
    102     "${WEBCORE_DIR}/dom"
    103     "${WEBCORE_DIR}/dom/default"
    104     "${WEBCORE_DIR}/editing"
    105     "${WEBCORE_DIR}/fileapi"
    106     "${WEBCORE_DIR}/history"
    107     "${WEBCORE_DIR}/html"
    108     "${WEBCORE_DIR}/html/canvas"
    109     "${WEBCORE_DIR}/html/shadow"
    110     "${WEBCORE_DIR}/html/track"
    111     "${WEBCORE_DIR}/inspector"
    112     "${WEBCORE_DIR}/loader"
    113     "${WEBCORE_DIR}/loader/archive"
    114     "${WEBCORE_DIR}/loader/icon"
    115     "${WEBCORE_DIR}/loader/cache"
    116     "${WEBCORE_DIR}/page"
    117     "${WEBCORE_DIR}/page/animation"
    118     "${WEBCORE_DIR}/page/csp"
    119     "${WEBCORE_DIR}/page/scrolling"
    120     "${WEBCORE_DIR}/platform"
    121     "${WEBCORE_DIR}/platform/animation"
    122     "${WEBCORE_DIR}/platform/audio"
    123     "${WEBCORE_DIR}/platform/gamepad"
    124     "${WEBCORE_DIR}/platform/graphics"
    125     "${WEBCORE_DIR}/platform/graphics/filters"
    126     "${WEBCORE_DIR}/platform/graphics/harfbuzz"
    127     "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
    128     "${WEBCORE_DIR}/platform/graphics/surfaces"
    129     "${WEBCORE_DIR}/platform/graphics/texmap"
    130     "${WEBCORE_DIR}/platform/graphics/transforms"
    131     "${WEBCORE_DIR}/platform/mediastream"
    132     "${WEBCORE_DIR}/platform/network"
    133     "${WEBCORE_DIR}/platform/spi/cf"
    134     "${WEBCORE_DIR}/platform/sql"
    135     "${WEBCORE_DIR}/platform/text"
    136     "${WEBCORE_DIR}/plugins"
    137     "${WEBCORE_DIR}/rendering"
    138     "${WEBCORE_DIR}/rendering/line"
    139     "${WEBCORE_DIR}/rendering/shapes"
    140     "${WEBCORE_DIR}/rendering/style"
    141     "${WEBCORE_DIR}/storage"
    142     "${WEBCORE_DIR}/style"
    143     "${WEBCORE_DIR}/svg"
    144     "${WEBCORE_DIR}/svg/graphics"
    145     "${WEBCORE_DIR}/svg/properties"
    146     "${WEBCORE_DIR}/workers"
    147     "${JAVASCRIPTCORE_DIR}"
    148     "${JAVASCRIPTCORE_DIR}/ForwardingHeaders"
    149     "${JAVASCRIPTCORE_DIR}/API"
    150     "${JAVASCRIPTCORE_DIR}/assembler"
    151     "${JAVASCRIPTCORE_DIR}/bytecode"
    152     "${JAVASCRIPTCORE_DIR}/bytecompiler"
    153     "${JAVASCRIPTCORE_DIR}/collector/handles"
    154     "${JAVASCRIPTCORE_DIR}/dfg"
    155     "${JAVASCRIPTCORE_DIR}/disassembler"
    156     "${JAVASCRIPTCORE_DIR}/domjit"
    157     "${JAVASCRIPTCORE_DIR}/heap"
    158     "${JAVASCRIPTCORE_DIR}/interpreter"
    159     "${JAVASCRIPTCORE_DIR}/jit"
    160     "${JAVASCRIPTCORE_DIR}/parser"
    161     "${JAVASCRIPTCORE_DIR}/profiler"
    162     "${JAVASCRIPTCORE_DIR}/runtime"
    163     "${WTF_DIR}"
    164     "${DERIVED_SOURCES_DIR}"
    165     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    166     "${DERIVED_SOURCES_WEBCORE_DIR}"
    16777    "${DERIVED_SOURCES_WEBKIT2_DIR}"
    16878    "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
    169     "${CMAKE_BINARY_DIR}"
    170     "${CMAKE_SOURCE_DIR}/Source"
    17179    "${CMAKE_SOURCE_DIR}/WebKitLibraries"
    17280)

  • trunk/Source/WebKit2/ChangeLog

    r209660 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        * CMakeLists.txt:
     13        * PlatformEfl.cmake:
     14        * PlatformGTK.cmake:
     15        * PlatformMac.cmake:
     16
    1172016-12-10  Antti Koivisto  <antti@apple.com>
    218

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r208959 r209665  
    232232
    233233list(APPEND WebKit2_INCLUDE_DIRECTORIES
    234     "${WEBCORE_DIR}/platform/efl"
    235     "${WEBCORE_DIR}/platform/graphics/cairo"
    236     "${WEBCORE_DIR}/platform/graphics/efl"
    237     "${WEBCORE_DIR}/platform/graphics/freetype"
    238     "${WEBCORE_DIR}/platform/graphics/opentype"
    239     "${WEBCORE_DIR}/platform/graphics/x11"
    240     "${WEBCORE_DIR}/platform/network/soup"
    241     "${WEBCORE_DIR}/platform/text/enchant"
    242234    "${WEBKIT2_DIR}/DatabaseProcess/unix"
    243235    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
    … …  
    275267    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
    276268    "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
    277     "${WTF_DIR}/wtf/efl"
    278     "${WTF_DIR}/wtf/glib"
    279     "${WTF_DIR}"
    280269    "${WEBKIT2_DIR}"
    281270)

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r208959 r209665  
    829829list(APPEND WebKit2_INCLUDE_DIRECTORIES
    830830    "${WEBKIT2_DIR}/PluginProcess/unix"
    831     "${WEBCORE_DIR}/platform/cairo"
    832     "${WEBCORE_DIR}/platform/gtk"
    833     "${WEBCORE_DIR}/platform/graphics/cairo"
    834     "${WEBCORE_DIR}/platform/graphics/freetype"
    835     "${WEBCORE_DIR}/platform/graphics/opentype"
    836     "${WEBCORE_DIR}/platform/graphics/x11"
    837     "${WEBCORE_DIR}/platform/network/soup"
    838     "${WEBCORE_DIR}/platform/text/enchant"
    839831    "${WEBKIT2_DIR}/DatabaseProcess/unix"
    840832    "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
    … …  
    873865    "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
    874866    "${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
    875     "${WTF_DIR}/wtf/gtk"
    876     "${WTF_DIR}/wtf/glib"
    877     "${WTF_DIR}"
    878867)
    879868
    … …  
    11931182    )
    11941183    list(APPEND WebKit2_INCLUDE_DIRECTORIES
    1195         "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
    11961184        "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
    11971185        "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
    … …  
    12121200    "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
    12131201    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
    1214     "${DERIVED_SOURCES_DIR}"
    12151202    "${DERIVED_SOURCES_DIR}/InjectedBundle"
    12161203    "${FORWARDING_HEADERS_DIR}"

  • trunk/Source/WebKit2/PlatformMac.cmake

    r209640 r209665  
    373373
    374374list(APPEND WebKit2_INCLUDE_DIRECTORIES
    375     "${WEBCORE_DIR}/icu"
    376     "${WEBCORE_DIR}/editing/cocoa"
    377     "${WEBCORE_DIR}/editing/mac"
    378     "${WEBCORE_DIR}/platform/cf"
    379     "${WEBCORE_DIR}/platform/cocoa"
    380     "${WEBCORE_DIR}/platform/graphics/cocoa"
    381     "${WEBCORE_DIR}/platform/mac"
    382     "${WEBCORE_DIR}/platform/network/cf"
    383     "${WEBCORE_DIR}/platform/network/cocoa"
    384     "${WEBCORE_DIR}/platform/spi/cocoa"
    385     "${WEBCORE_DIR}/platform/spi/mac"
    386     "${WEBCORE_DIR}/platform/graphics/ca"
    387     "${WEBCORE_DIR}/platform/graphics/cg"
    388     "${WEBCORE_DIR}/platform/graphics/opentype"
    389375    "${WEBKIT2_DIR}/NetworkProcess/cocoa"
    390376    "${WEBKIT2_DIR}/NetworkProcess/mac"
    … …  
    424410    "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
    425411    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
    426     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    427412    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
    428 )
    429 
    430 # This is needed because of a naming conflict with DiagnosticLoggingClient.h.
    431 # FIXME: Rename one of the DiagnosticLoggingClient headers.
    432 list(REMOVE_ITEM WebKit2_INCLUDE_DIRECTORIES
    433     "${WEBCORE_DIR}/page"
    434 )
    435 list(APPEND WebKit2_INCLUDE_DIRECTORIES
    436     "${WEBCORE_DIR}/page"
    437413)
    438414

  • trunk/Source/cmake/WebKitMacros.cmake

    r208357 r209665  
    293293
    294294macro(WEBKIT_FRAMEWORK _target)
    295     include_directories(${${_target}_INCLUDE_DIRECTORIES})
    296295    include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
    297296    add_library(${_target} ${${_target}_LIBRARY_TYPE}
    … …  
    299298        ${${_target}_SOURCES}
    300299    )
     300    target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
    301301    target_link_libraries(${_target} ${${_target}_LIBRARIES})
    302302    set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")

  • trunk/Tools/ChangeLog

    r209655 r209665  
     12016-12-10  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
     4        https://bugs.webkit.org/show_bug.cgi?id=165686
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This change reduces duplication of include path lists between modules,
     9        and reduces future need for fixes like r209605 (broken build because of
     10        WebCore header suddenly becoming used in WebKit2).
     11
     12        * DumpRenderTree/CMakeLists.txt:
     13        * DumpRenderTree/PlatformMac.cmake:
     14        * ImageDiff/CMakeLists.txt:
     15        * MiniBrowser/gtk/CMakeLists.txt:
     16        * MiniBrowser/mac/CMakeLists.txt:
     17        * MiniBrowser/win/CMakeLists.txt:
     18        * TestWebKitAPI/CMakeLists.txt:
     19        * TestWebKitAPI/PlatformEfl.cmake:
     20        * TestWebKitAPI/PlatformJSCOnly.cmake:
     21        * TestWebKitAPI/PlatformMac.cmake:
     22        * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:
     23        * WebKitTestRunner/CMakeLists.txt:
     24        * WebKitTestRunner/PlatformGTK.cmake:
     25        * WebKitTestRunner/PlatformMac.cmake:
     26
    1272016-12-09  Csaba Osztrogonác  <ossy@webkit.org>
    228

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r208429 r209665  
    2727
    2828set(DumpRenderTree_INCLUDE_DIRECTORIES
    29     ${WEBCORE_DIR}
    30     ${WEBCORE_DIR}/bindings
    31     ${WEBCORE_DIR}/bridge
    32     ${WEBCORE_DIR}/bridge/jsc
    33     ${WEBCORE_DIR}/css
    34     ${WEBCORE_DIR}/dom
    35     ${WEBCORE_DIR}/editing
    36     ${WEBCORE_DIR}/history
    37     ${WEBCORE_DIR}/html
    38     ${WEBCORE_DIR}/inspector
    39     ${WEBCORE_DIR}/loader
    40     ${WEBCORE_DIR}/loader/cache
    41     ${WEBCORE_DIR}/loader/icon
    42     ${WEBCORE_DIR}/page
    43     ${WEBCORE_DIR}/page/animation
    44     ${WEBCORE_DIR}/platform
    45     ${WEBCORE_DIR}/platform/animation
    46     ${WEBCORE_DIR}/platform/graphics
    47     ${WEBCORE_DIR}/platform/graphics/transforms
    48     ${WEBCORE_DIR}/platform/network
    49     ${WEBCORE_DIR}/platform/text
    50     ${WEBCORE_DIR}/plugins
    51     ${WEBCORE_DIR}/rendering
    52     ${WEBCORE_DIR}/rendering/shapes
    53     ${WEBCORE_DIR}/rendering/style
    54     ${JAVASCRIPTCORE_DIR}
    55     ${JAVASCRIPTCORE_DIR}/API
    56     ${JAVASCRIPTCORE_DIR}/assembler
    57     ${JAVASCRIPTCORE_DIR}/bytecode
    58     ${JAVASCRIPTCORE_DIR}/dfg
    59     ${JAVASCRIPTCORE_DIR}/disassembler
    60     ${JAVASCRIPTCORE_DIR}/domjit
    61     ${JAVASCRIPTCORE_DIR}/heap
    62     ${JAVASCRIPTCORE_DIR}/interpreter
    63     ${JAVASCRIPTCORE_DIR}/jit
    64     ${JAVASCRIPTCORE_DIR}/llint
    65     ${JAVASCRIPTCORE_DIR}/parser
    66     ${JAVASCRIPTCORE_DIR}/profiler
    67     ${JAVASCRIPTCORE_DIR}/runtime
    68     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
    69     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    70     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
    7129    ${DERIVED_SOURCES_DIR}/DumpRenderTree
    7230    ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
    7331    ${WEBKIT_TESTRUNNER_SHARED_DIR}/Bindings
    7432    ${TOOLS_DIR}/DumpRenderTree
    75     ${WTF_DIR}
    7633    ${CMAKE_SOURCE_DIR}/Source
    77     ${CMAKE_BINARY_DIR}
    78     ${DERIVED_SOURCES_DIR}
    79     ${DERIVED_SOURCES_WEBCORE_DIR}
    80     ${WEBCORE_DIR}/bindings/js
    8134    ${WEBCORE_DIR}/testing/js
    8235)

  • trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r209533 r209665  
    4545    ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit
    4646    ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy
    47     ${WTF_DIR}/icu
    4847)
    4948

  • trunk/Tools/ImageDiff/CMakeLists.txt

    r199289 r209665  
    11set(IMAGE_DIFF_DIR "${TOOLS_DIR}/ImageDiff")
    2 
    3 set(IMAGE_DIFF_INCLUDE_DIRECTORIES
    4     ${CMAKE_BINARY_DIR}
    5     ${WTF_DIR}
    6 )
    72
    83set(IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES "")

  • trunk/Tools/MiniBrowser/gtk/CMakeLists.txt

    r206434 r209665  
    2222
    2323set(MiniBrowser_INCLUDE_DIRECTORIES
    24     ${CMAKE_BINARY_DIR}
    2524    ${DERIVED_SOURCES_MINIBROWSER_DIR}
    2625    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}

  • trunk/Tools/MiniBrowser/mac/CMakeLists.txt

    r208429 r209665  
    1717
    1818set(MiniBrowser_INCLUDE_DIRECTORIES
    19     ${CMAKE_BINARY_DIR}
    2019    ${CMAKE_SOURCE_DIR}/Source
    21     ${DERIVED_SOURCES_DIR}
    2220    ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    2321    ${FORWARDING_HEADERS_DIR}

  • trunk/Tools/MiniBrowser/win/CMakeLists.txt

    r201914 r209665  
    22    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    33    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
    4     "${WTF_DIR}"
    54    "${CMAKE_SOURCE_DIR}"
    65    "${CMAKE_SOURCE_DIR}/Source"

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r208963 r209665  
    100100    ${CMAKE_BINARY_DIR}
    101101    ${CMAKE_SOURCE_DIR}/Source
    102     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
    103     ${DERIVED_SOURCES_WEBCORE_DIR}
    104102    ${JAVASCRIPTCORE_DIR}
    105     ${JAVASCRIPTCORE_DIR}/API
    106     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
    107103    ${THIRDPARTY_DIR}/gtest/include
    108     ${WEBCORE_DIR}/css
    109     ${WEBCORE_DIR}/css/parser
    110     ${WEBCORE_DIR}/dom
    111     ${WEBCORE_DIR}/editing
    112     ${WEBCORE_DIR}/loader/cache
    113     ${WEBCORE_DIR}/page
    114     ${WEBCORE_DIR}/platform
    115     ${WEBCORE_DIR}/platform/animation
    116     ${WEBCORE_DIR}/platform/graphics
    117     ${WEBCORE_DIR}/platform/text
    118     ${WEBCORE_DIR}/platform/network
    119     ${WEBCORE_DIR}/platform/network/soup
    120     ${WEBCORE_DIR}/rendering/style
    121104    ${WEBKIT2_DIR}/Platform/IPC
    122105    ${WEBKIT2_DIR}/Shared
    … …  
    128111    ${WEBKIT2_DIR}/WebProcess/InjectedBundle
    129112    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
    130     ${WTF_DIR}
    131113)
    132114
    … …  
    223205    )
    224206
     207    target_link_libraries(TestWebKitAPIBase ${test_webkit2_api_LIBRARIES})
     208
    225209    add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
    226210

  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r207325 r209665  
    1010include_directories(
    1111    ${DERIVED_SOURCES_WEBKIT2_DIR}/include
    12     ${WTF_DIR}/wtf/efl
    1312    ${WEBKIT2_DIR}/UIProcess/API/C/CoordinatedGraphics
    1413    ${WEBKIT2_DIR}/UIProcess/API/C/soup

  • trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake

    r208357 r209665  
    44include_directories(
    55    ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    6     "${WTF_DIR}/icu"
    76)
    87

  • trunk/Tools/TestWebKitAPI/PlatformMac.cmake

    r203447 r209665  
    44include_directories(
    55    ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    6     "${WTF_DIR}/icu"
    76)
    87

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt

    r193620 r209665  
    1313
    1414include_directories(
    15     ${CMAKE_BINARY_DIR}
    1615    ${CMAKE_SOURCE_DIR}/Source
    1716    ${CMAKE_SOURCE_DIR}/Source/WTF
    18     ${DERIVED_SOURCES_DIR}
    1917    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
    2018    ${FORWARDING_HEADERS_DIR}

  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r207617 r209665  
    3636    ${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}
    3737    ${WEBKIT_TESTRUNNER_BINDINGS_DIR}
    38     ${JAVASCRIPTCORE_DIR}
    39     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
    40     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
    41     ${WEBCORE_DIR}/editing
    42     ${WEBCORE_DIR}/platform
    43     ${WEBCORE_DIR}/platform/graphics
    44     ${WEBCORE_DIR}/platform/graphics/harfbuzz
    45     ${WEBCORE_DIR}/platform/graphics/harfbuzz/ng
    46     ${WEBCORE_DIR}/platform/network
    47     ${WEBCORE_DIR}/platform/text
    4838    ${WEBCORE_DIR}/testing/js
    4939    ${WEBKIT2_DIR}/Platform/IPC
    … …  
    5545    ${WEBKIT2_DIR}/WebProcess/InjectedBundle
    5646    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
    57     ${WTF_DIR}
    5847    ${DERIVED_SOURCES_DIR}/InjectedBundle
    5948    ${DERIVED_SOURCES_DIR}/UIScriptContext
    60     ${CMAKE_BINARY_DIR}
    6149    ${CMAKE_SOURCE_DIR}/Source
    6250)

  • trunk/Tools/WebKitTestRunner/PlatformGTK.cmake

    r205012 r209665  
    1616list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
    1717    ${FORWARDING_HEADERS_DIR}
    18     ${WTF_DIR}/wtf/glib
    1918)
    2019

  • trunk/Tools/WebKitTestRunner/PlatformMac.cmake

    r201877 r209665  
    2929    ${WEBKIT_TESTRUNNER_DIR}/mac
    3030    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
    31     ${WTF_DIR}/icu
    3231    ${CMAKE_SOURCE_DIR}/WebKitLibraries
    3332)
Note: See TracChangeset for help on using the changeset viewer.