⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 215606 in webkit


Ignore:
Timestamp:
Apr 20, 2017, 11:08:13 PM (9 years ago)
Author:
Konstantin Tokarev
Message:

[cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
​https://bugs.webkit.org/show_bug.cgi?id=171071

Reviewed by Michael Catanzaro.

"${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
be available for all ports.

.:

  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/WebKitFS.cmake:
  • Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

  • CMakeLists.txt:
  • PlatformWin.cmake:

Source/ThirdParty/ANGLE:

  • CMakeLists.txt:

Source/WebCore:

  • CMakeLists.txt:
  • PlatformMac.cmake:
  • PlatformWin.cmake:
  • PlatformWinCairo.cmake:

Source/WebKit:

  • CMakeLists.txt:
  • PlatformMac.cmake:
  • PlatformWin.cmake:

Source/WebKit2:

  • CMakeLists.txt:
  • PlatformMac.cmake:

Tools:

  • DumpRenderTree/PlatformMac.cmake:
  • MiniBrowser/mac/CMakeLists.txt:
  • MiniBrowser/win/CMakeLists.txt:
  • TestWebKitAPI/PlatformJSCOnly.cmake:
  • TestWebKitAPI/PlatformMac.cmake:
  • TestWebKitAPI/PlatformWin.cmake:
  • WebKitTestRunner/PlatformMac.cmake:
Location:
trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r215408 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * Source/cmake/OptionsGTK.cmake:
     13        * Source/cmake/WebKitFS.cmake:
     14        * Source/cmake/WebKitMacros.cmake:
     15
    1162017-04-17  Yusuke Suzuki  <utatane.tea@gmail.com>
    217

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r215373 r215606  
    3939    "${JAVASCRIPTCORE_DIR}/wasm/js"
    4040    "${JAVASCRIPTCORE_DIR}/yarr"
    41     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     41    "${FORWARDING_HEADERS_DIR}"
    4242    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
    4343    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    … …  
    10711071
    10721072# Force JavaScriptCore to run scripts from the same staging path as WebCore.
    1073 set(JavaScriptCore_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/Scripts")
     1073set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")
    10741074
    10751075file(MAKE_DIRECTORY ${JavaScriptCore_SCRIPTS_DIR})

  • trunk/Source/JavaScriptCore/ChangeLog

    r215601 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * CMakeLists.txt:
     13        * PlatformWin.cmake:
     14
    1152017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
    216

  • trunk/Source/JavaScriptCore/PlatformWin.cmake

    r195593 r215606  
    3030)
    3131
    32 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore)
     32file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/JavaScriptCore)
    3333
    3434set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd")
    3535file(REMOVE "${JavaScriptCore_PRE_BUILD_COMMAND}")
    3636foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
    37     file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
     37    file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${FORWARDING_HEADERS_DIR}/JavaScriptCore\" >nul 2>nul\n")
    3838endforeach ()
    3939
    4040set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd")
    41 file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
    42 file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
     41file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${FORWARDING_HEADERS_DIR}/JavaScriptCore\" >nul 2>nul\n")
     42file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${FORWARDING_HEADERS_DIR}/JavaScriptCore\" >nul 2>nul\n")
    4343
    4444set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})

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

    r215585 r215606  
    260260target_link_libraries(libGLESv2 ${ANGLEGLESv2_LIBRARIES})
    261261
    262 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
    263 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
    264 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
    265 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
     262file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
     263file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
     264file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
     265file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
    266266file(GLOB _files_ANGLE "${THIRDPARTY_DIR}/ANGLE/ANGLE/*.h")
    267267file(GLOB _files_egl "${THIRDPARTY_DIR}/ANGLE/include/egl/*.h")
    … …  
    271271file(GLOB _files_khr "${THIRDPARTY_DIR}/ANGLE/include/khr/*.h")
    272272foreach (_file ${_files_ANGLE})
    273     file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/)
     273    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/)
    274274endforeach ()
    275275foreach (_file ${_files_egl})
    276     file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl)
     276    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/egl)
    277277endforeach ()
    278278foreach (_file ${_files_GLES2})
    279     file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES2)
     279    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES2)
    280280endforeach ()
    281281foreach (_file ${_files_GLES3})
    282     file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLES3)
     282    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLES3)
    283283endforeach ()
    284284foreach (_file ${_files_GLSLANG})
    285     file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/GLSLANG)
     285    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/GLSLANG)
    286286endforeach ()
    287287foreach (_file ${_files_khr})
    288     file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
     288    file(COPY ${_file} DESTINATION ${FORWARDING_HEADERS_DIR}/ANGLE/include/khr)
    289289endforeach ()
    290290

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r215585 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * CMakeLists.txt:
     13
    1142017-04-20  Fujii Hironori  <Hironori.Fujii@sony.com>
    215

  • trunk/Source/WebCore/CMakeLists.txt

    r215605 r215606  
    843843    set(ANGLE_FORWARDING_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/ANGLE")
    844844else ()
    845     set(JavaScriptCore_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/Scripts")
    846     set(ANGLE_FORWARDING_HEADERS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE")
     845    set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")
     846    set(ANGLE_FORWARDING_HEADERS_DIR "${FORWARDING_HEADERS_DIR}/ANGLE")
    847847endif ()
    848848

  • trunk/Source/WebCore/ChangeLog

    r215605 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * CMakeLists.txt:
     13        * PlatformMac.cmake:
     14        * PlatformWin.cmake:
     15        * PlatformWinCairo.cmake:
     16
    1172017-04-20  Commit Queue  <commit-queue@webkit.org>
    218

  • trunk/Source/WebCore/PlatformMac.cmake

    r215438 r215606  
    7070
    7171list(APPEND WebCore_INCLUDE_DIRECTORIES
    72     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
     72    "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
    7373    "${THIRDPARTY_DIR}/ANGLE"
    7474    "${THIRDPARTY_DIR}/ANGLE/include/KHR"

  • trunk/Source/WebCore/PlatformWin.cmake

    r215585 r215606  
    55    "${CMAKE_BINARY_DIR}/../include/private"
    66    "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
    7     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
    8     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/KHR"
    9     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    10     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/ForwardingHeaders"
    11     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/API"
    12     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/assembler"
    13     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/builtins"
    14     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecode"
    15     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/bytecompiler"
    16     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/dfg"
    17     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/disassembler"
    18     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/domjit"
    19     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/heap"
    20     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/debugger"
    21     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/interpreter"
    22     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/jit"
    23     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/llint"
    24     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/parser"
    25     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/profiler"
    26     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/runtime"
    27     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/yarr"
    28     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
     7    "${FORWARDING_HEADERS_DIR}/ANGLE"
     8    "${FORWARDING_HEADERS_DIR}/ANGLE/include/KHR"
     9    "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
     10    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/ForwardingHeaders"
     11    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/API"
     12    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/assembler"
     13    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/builtins"
     14    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/bytecode"
     15    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/bytecompiler"
     16    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/dfg"
     17    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/disassembler"
     18    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/domjit"
     19    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/heap"
     20    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/debugger"
     21    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/interpreter"
     22    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/jit"
     23    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/llint"
     24    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/parser"
     25    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/profiler"
     26    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/runtime"
     27    "${FORWARDING_HEADERS_DIR}/JavaScriptCore/yarr"
     28    "${FORWARDING_HEADERS_DIR}/WTF"
    2929    "${WEBCORE_DIR}/accessibility/win"
    3030    "${WEBCORE_DIR}/page/win"
    … …  
    303303endif ()
    304304
    305 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore)
     305file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebCore)
    306306
    307307set(WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
    308 file(WRITE "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
     308file(WRITE "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WEBCORE_DIR}/ForwardingHeaders/*.h\" \"${FORWARDING_HEADERS_DIR}/WebCore\" >nul 2>nul\n")
    309309foreach (_directory ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
    310     file(APPEND "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
     310    file(APPEND "${WebCore_DERIVED_SOURCES_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${FORWARDING_HEADERS_DIR}/WebCore\" >nul 2>nul\n")
    311311endforeach ()
    312312
    313313set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")
    314 file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
     314file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${FORWARDING_HEADERS_DIR}/WebCore\" >nul 2>nul\n")
    315315
    316316set(WebCore_OUTPUT_NAME

  • trunk/Source/WebCore/PlatformWinCairo.cmake

    r213124 r215606  
    44list(APPEND WebCore_INCLUDE_DIRECTORIES
    55    ${CAIRO_INCLUDE_DIRS}
    6     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
     6    "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
    77    "${DirectX_INCLUDE_DIRS}"
    88    "${WEBKIT_LIBRARIES_DIR}/include"

  • trunk/Source/WebKit/CMakeLists.txt

    r211027 r215606  
    2121    "${WEBKIT_DIR}/Storage"
    2222    "${WEBKIT_DIR}/WebCoreSupport"
    23     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    24     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
    25     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
     23    "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
     24    "${FORWARDING_HEADERS_DIR}/WebCore"
     25    "${FORWARDING_HEADERS_DIR}/WebKitLegacy"
    2626)
    2727

  • trunk/Source/WebKit/ChangeLog

    r215315 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * CMakeLists.txt:
     13        * PlatformMac.cmake:
     14        * PlatformWin.cmake:
     15
    1162017-04-12  Brady Eidson  <beidson@apple.com>
    217

  • trunk/Source/WebKit/PlatformMac.cmake

    r214459 r215606  
    442442
    443443WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
    444 WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
     444WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${FORWARDING_HEADERS_DIR}/WebKitLegacy)
    445445
    446446# FIXME: Forwarding headers should be copies of actual headers.
    … …  
    452452foreach (_file ${ObjCHeaders})
    453453    get_filename_component(_name ${_file} NAME)
    454     if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name})
    455         file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
     454    if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name})
     455        file(WRITE ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
    456456    endif ()
    457457endforeach ()

  • trunk/Source/WebKit/PlatformWin.cmake

    r214943 r215606  
    5858    "${DERIVED_SOURCES_WEBKIT_DIR}/include"
    5959    "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
    60     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
    61     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include"
    62     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/egl"
    63     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr"
     60    "${FORWARDING_HEADERS_DIR}/ANGLE"
     61    "${FORWARDING_HEADERS_DIR}/ANGLE/include"
     62    "${FORWARDING_HEADERS_DIR}/ANGLE/include/egl"
     63    "${FORWARDING_HEADERS_DIR}/ANGLE/include/khr"
    6464    "${DERIVED_SOURCES_DIR}/WebKit"
    6565)
    … …  
    479479
    480480set(WebKitGUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/preBuild.cmd")
    481 file(WRITE "${WebKitGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")
    482 file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
     481file(WRITE "${WebKitGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul\n")
     482file(MAKE_DIRECTORY ${FORWARDING_HEADERS_DIR}/WebKit)
    483483add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
    484484
    485485set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
    486 file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
     486file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${FORWARDING_HEADERS_DIR}/WebKit\" >nul 2>nul")
    487487add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
    488488

  • trunk/Source/WebKit2/CMakeLists.txt

    r214934 r215606  
    721721    set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")
    722722else ()
    723     set(JavaScriptCore_SCRIPTS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/Scripts")
     723    set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")
    724724endif ()
    725725

  • trunk/Source/WebKit2/ChangeLog

    r215598 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * CMakeLists.txt:
     13        * PlatformMac.cmake:
     14
    1152017-04-20  Brady Eidson  <beidson@apple.com>
    216

  • trunk/Source/WebKit2/PlatformMac.cmake

    r214934 r215606  
    428428    "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
    429429    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
    430     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
     430    "${FORWARDING_HEADERS_DIR}/WebCore"
    431431    "${DERIVED_SOURCES_WEBCORE_DIR}"
    432432)
    … …  
    523523foreach (_file ${ObjCHeaders})
    524524    get_filename_component(_name ${_file} NAME)
    525     if (NOT EXISTS ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_name})
    526         file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_name} "#import <WebKit2/UIProcess/API/Cocoa/${_name}>")
     525    if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/${_name})
     526        file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_name} "#import <WebKit2/UIProcess/API/Cocoa/${_name}>")
    527527    endif ()
    528528endforeach ()
    … …  
    584584)
    585585foreach (_file ${WebKitLegacyForwardingHeaders})
    586     file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
     586    file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
    587587endforeach ()
    588588
    … …  
    728728)
    729729foreach (_file ${ObjCForwardingHeaders})
    730     file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
     730    file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
    731731endforeach ()
    732732
    … …  
    736736
    737737# FIXME: These should not be necessary.
    738 file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
    739 file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
    740 file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
     738file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
     739file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
     740file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
    741741
    742742set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")

  • trunk/Source/cmake/OptionsGTK.cmake

    r215106 r215606  
    428428set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
    429429set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
    430 set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
    431430set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
    432431set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)

  • trunk/Source/cmake/WebKitFS.cmake

    r211027 r215606  
    3535set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
    3636
     37set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
     38
    3739file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
    3840file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)

  • trunk/Source/cmake/WebKitMacros.cmake

    r215403 r215606  
    333333        set(_processing_directories 0)
    334334        set(_processing_files 0)
    335         set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")
     335        set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")
    336336
    337337        file(GLOB _files "${_target_directory}/*.h")

  • trunk/Tools/ChangeLog

    r215599 r215606  
     12017-04-20  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Define FORWARDING_HEADERS_DIR in WebKitFS and use it everywhere
     4        https://bugs.webkit.org/show_bug.cgi?id=171071
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        "${DERIVED_SOURCES_DIR}/ForwardingHeaders" path occurs very often in the
     9        build system files. GTK-specifc FORWARDING_HEADERS_DIR variable should
     10        be available for all ports.
     11
     12        * DumpRenderTree/PlatformMac.cmake:
     13        * MiniBrowser/mac/CMakeLists.txt:
     14        * MiniBrowser/win/CMakeLists.txt:
     15        * TestWebKitAPI/PlatformJSCOnly.cmake:
     16        * TestWebKitAPI/PlatformMac.cmake:
     17        * TestWebKitAPI/PlatformWin.cmake:
     18        * WebKitTestRunner/PlatformMac.cmake:
     19
    1202017-04-20  Joseph Pecoraro  <pecoraro@apple.com>
    221

  • trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r212735 r215606  
    4343    mac/InternalHeaders/WebKit
    4444    TestNetscapePlugIn
    45     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    46     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
    47     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit
    48     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy
     45    ${FORWARDING_HEADERS_DIR}
     46    ${FORWARDING_HEADERS_DIR}/WebCore
     47    ${FORWARDING_HEADERS_DIR}/WebKit
     48    ${FORWARDING_HEADERS_DIR}/WebKitLegacy
    4949    ${WEBCORE_DIR}/testing/cocoa
    5050)

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

    r209665 r215606  
    1818set(MiniBrowser_INCLUDE_DIRECTORIES
    1919    ${CMAKE_SOURCE_DIR}/Source
    20     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    2120    ${FORWARDING_HEADERS_DIR}
    2221    ${MINIBROWSER_DIR}

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

    r209665 r215606  
    11set(MiniBrowser_INCLUDE_DIRECTORIES
    2     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    3     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
     2    "${FORWARDING_HEADERS_DIR}"
     3    "${FORWARDING_HEADERS_DIR}/WebKit"
    44    "${CMAKE_SOURCE_DIR}"
    55    "${CMAKE_SOURCE_DIR}/Source"

  • trunk/Tools/TestWebKitAPI/PlatformJSCOnly.cmake

    r209665 r215606  
    33
    44include_directories(
    5     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
     5    ${FORWARDING_HEADERS_DIR}
    66)
    77

  • trunk/Tools/TestWebKitAPI/PlatformMac.cmake

    r209665 r215606  
    33
    44include_directories(
    5     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
     5    ${FORWARDING_HEADERS_DIR}
    66)
    77

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r211836 r215606  
    1818include_directories(
    1919    ${DERIVED_SOURCES_DIR}
    20     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    21     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore
     20    ${FORWARDING_HEADERS_DIR}
     21    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    2222    ${TESTWEBKITAPI_DIR}/win
    2323    ${DERIVED_SOURCES_DIR}/WebKit/Interfaces

  • trunk/Tools/WebKitTestRunner/PlatformMac.cmake

    r214946 r215606  
    2323    ${DERIVED_SOURCES_DIR}
    2424    ${DERIVED_SOURCES_DIR}/WebCore
    25     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    26     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore
    27     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore
     25    ${FORWARDING_HEADERS_DIR}
     26    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
     27    ${FORWARDING_HEADERS_DIR}/WebCore
    2828    ${WEBCORE_DIR}/testing/cocoa
    2929    ${WEBKIT_TESTRUNNER_DIR}/cf
Note: See TracChangeset for help on using the changeset viewer.