Attachment 327722 Details for Bug 180063 – [WIP] Patch

[patch] [WIP] Patch

bug-180063.diff (text/plain), 2.54 KB, created by Don Olmstead on 2017-11-27 20:03:12 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2017-11-27 20:03:12 PST

Size: 2.54 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 90139b48d11..9a57ab77f89 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2017-11-27  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Add macro to copy forwarding headers
>+        https://bugs.webkit.org/show_bug.cgi?id=180063
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/WebKitMacros.cmake:
>+
> 2017-11-27  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][Win] Conditionally select DLL CRT or static CRT
>diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
>index fa32fe8e4e4..1585caebbc5 100644
>--- a/Source/cmake/WebKitMacros.cmake
>+++ b/Source/cmake/WebKitMacros.cmake
>@@ -215,6 +215,52 @@ macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
>     endif ()
> endmacro()
> 
>+macro(WEBKIT_COPY_FORWARDING_HEADERS _framework)
>+    set(_file_list)
>+
>+    set(_processing_directories 0)
>+    set(_processing_files 0)
>+    set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")
>+
>+    file(GLOB _files "${_target_directory}/*.h")
>+    foreach (_file ${_files})
>+        file(READ "${_file}" _content)
>+        string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
>+        if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
>+            file(REMOVE "${_file}")
>+        endif ()
>+    endforeach ()
>+
>+    foreach (_currentArg ${ARGN})
>+        if ("${_currentArg}" STREQUAL "DIRECTORIES")
>+            set(_processing_directories 1)
>+            set(_processing_files 0)
>+        elseif ("${_currentArg}" STREQUAL "FILES")
>+            set(_processing_directories 0)
>+            set(_processing_files 1)
>+        elseif (_processing_directories)
>+            file(GLOB _files "${_currentArg}/*.h")
>+            foreach (_file ${_files})
>+                get_filename_component(_absolute ${_file} ABSOLUTE)
>+                list(APPEND _file_list ${_absolute})
>+            endforeach ()
>+        elseif (_processing_files)
>+            get_filename_component(_absolute ${_currentArg} ABSOLUTE)
>+            list(APPEND _file_list ${_absolute})
>+        endif ()
>+    endforeach ()
>+
>+    foreach (_file ${_file_list})
>+        get_filename_component(_name "${_file}" NAME)
>+        add_custom_command(
>+            TARGET ${_framework}
>+            POST_BUILD
>+            MAIN_DEPENDENCY ${_file}
>+            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file} ${_target_directory}
>+        )
>+    endforeach()
>+endmacro()
>+
> # Helper macros for debugging CMake problems.
> macro(WEBKIT_DEBUG_DUMP_COMMANDS)
>     set(CMAKE_VERBOSE_MAKEFILE ON)

Actions: View | Formatted Diff | Diff

Attachments on bug 180063: 327722 | 327920