Changeset 243729 in webkit


Ignore:
Timestamp:
Apr 1, 2019 6:08:38 PM (5 years ago)
Author:
Fujii Hironori
Message:

[CMake] Remove EXTRA_DIRECTORIES parameter of WEBKIT_MAKE_FORWARDING_HEADERS
https://bugs.webkit.org/show_bug.cgi?id=196436

Reviewed by Darin Adler.

The parameter was only for WebCore/ForwardingHeaders which was
removed in Bug 182347.

  • Source/cmake/WebKitMacros.cmake: Remove unused EXTRA_DIRECTORIES parameter.
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r243700 r243729  
     12019-04-01  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [CMake] Remove EXTRA_DIRECTORIES parameter of WEBKIT_MAKE_FORWARDING_HEADERS
     4        https://bugs.webkit.org/show_bug.cgi?id=196436
     5
     6        Reviewed by Darin Adler.
     7
     8        The parameter was only for WebCore/ForwardingHeaders which was
     9        removed in Bug 182347.
     10
     11        * Source/cmake/WebKitMacros.cmake: Remove unused EXTRA_DIRECTORIES parameter.
     12
    1132019-04-01  Stephan Szabo  <stephan.szabo@sony.com>
    214
  • trunk/Source/cmake/WebKitMacros.cmake

    r239561 r243729  
    237237    set(options FLATTENED)
    238238    set(oneValueArgs DESTINATION TARGET_NAME)
    239     set(multiValueArgs DIRECTORIES EXTRA_DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
     239    set(multiValueArgs DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
    240240    cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    241241    set(headers ${opt_FILES})
     
    266266        )
    267267        list(APPEND fwd_headers ${fwd_header})
    268     endforeach ()
    269     foreach (dir IN LISTS opt_EXTRA_DIRECTORIES)
    270         set(dir ${CMAKE_CURRENT_SOURCE_DIR}/${dir})
    271         file(GLOB_RECURSE files RELATIVE ${dir} ${dir}/*.h)
    272         foreach (header IN LISTS files)
    273             get_filename_component(header_dir ${header} DIRECTORY)
    274             file(MAKE_DIRECTORY ${destination}/${header_dir})
    275             set(fwd_header ${destination}/${header})
    276             add_custom_command(OUTPUT ${fwd_header}
    277                 COMMAND ${CMAKE_COMMAND} -E copy ${dir}/${header} ${fwd_header}
    278                 MAIN_DEPENDENCY ${dir}/${header}
    279                 VERBATIM
    280             )
    281             list(APPEND fwd_headers ${fwd_header})
    282         endforeach ()
    283268    endforeach ()
    284269    if (opt_TARGET_NAME)
Note: See TracChangeset for help on using the changeset viewer.