Changeset 229282 in webkit


Ignore:
Timestamp:
Mar 5, 2018, 5:28:35 AM (7 years ago)
Author:
don.olmstead@sony.com
Message:

[CMake] Split JSC header copying into public and private targets
https://bugs.webkit.org/show_bug.cgi?id=183251

Reviewed by Konstantin Tokarev.

.:

  • Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

  • CMakeLists.txt:

Source/ThirdParty:

  • gtest/CMakeLists.txt:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r229189 r229282  
     12018-03-05  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Split JSC header copying into public and private targets
     4        https://bugs.webkit.org/show_bug.cgi?id=183251
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * Source/cmake/WebKitMacros.cmake:
     9
    1102018-03-02  Don Olmstead  <don.olmstead@sony.com>
    211
  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r228898 r229282  
    254254)
    255255target_link_libraries(LLIntOffsetsExtractor WTF)
     256add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
    256257
    257258# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
     
    11741175
    11751176WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
    1176     FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS} ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
     1177    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
     1178    FLATTENED
     1179)
     1180
     1181WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
     1182    TARGET_NAME JavaScriptCorePrivateForwardingHeaders
     1183    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
    11771184    DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_DIR}/JavaScriptCore ${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector
    11781185    FLATTENED
  • trunk/Source/JavaScriptCore/ChangeLog

    r229209 r229282  
     12018-03-05  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Split JSC header copying into public and private targets
     4        https://bugs.webkit.org/show_bug.cgi?id=183251
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * CMakeLists.txt:
     9
    1102018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
    211
  • trunk/Source/ThirdParty/ChangeLog

    r228218 r229282  
     12018-03-05  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CMake] Split JSC header copying into public and private targets
     4        https://bugs.webkit.org/show_bug.cgi?id=183251
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * gtest/CMakeLists.txt:
     9
    1102018-02-06  Don Olmstead  <don.olmstead@sony.com>
    211
  • trunk/Source/ThirdParty/gtest/CMakeLists.txt

    r228218 r229282  
    4747    WTF
    4848)
    49 add_dependencies(gtest JavaScriptCoreForwardingHeaders)
     49add_dependencies(gtest JavaScriptCorePrivateForwardingHeaders)
    5050
    5151if (CMAKE_USE_PTHREADS_INIT)
  • trunk/Source/cmake/WebKitMacros.cmake

    r227090 r229282  
    218218function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
    219219    set(options FLATTENED)
    220     set(oneValueArgs DESTINATION)
     220    set(oneValueArgs DESTINATION TARGET_NAME)
    221221    set(multiValueArgs DIRECTORIES EXTRA_DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
    222222    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     
    264264        endforeach ()
    265265    endforeach ()
    266     add_custom_target(${framework}ForwardingHeaders DEPENDS ${fwd_headers})
    267     add_dependencies(${framework} ${framework}ForwardingHeaders)
     266    if (opt_TARGET_NAME)
     267        set(target_name ${opt_TARGET_NAME})
     268    else ()
     269        set(target_name ${framework}ForwardingHeaders)
     270    endif ()
     271    add_custom_target(${target_name} DEPENDS ${fwd_headers})
     272    add_dependencies(${framework} ${target_name})
    268273    if (opt_DERIVED_SOURCE_DIRECTORIES)
    269274        set(script ${CMAKE_CURRENT_BINARY_DIR}/makeForwardingHeaders.cmake)
Note: See TracChangeset for help on using the changeset viewer.