<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243746] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243746">243746</a></dd>
<dt>Author</dt> <dd>Hironori.Fujii@sony.com</dd>
<dt>Date</dt> <dd>2019-04-02 09:33:02 -0700 (Tue, 02 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CMake] WEBKIT_MAKE_FORWARDING_HEADERS shouldn't use POST_BUILD to copy generated headers
https://bugs.webkit.org/show_bug.cgi?id=182757

Reviewed by Don Olmstead.

.:

Some generated headers need to be exported to its client modules.
Before this change, WEBKIT_MAKE_FORWARDING_HEADERS copies all *.h
files in the directory specified by DERIVED_SOURCE_DIRECTORIES
parameter. The copy operation was triggered by POST_BUILD event.

This caused build dependency issues for Ninja builds. This change
remove the DERIVED_SOURCE_DIRECTORIES parameter. And list all
generated headers explicitly which need to be copied.

* Source/cmake/WebKitMacros.cmake: Removed
DERIVED_SOURCE_DIRECTORIES parameter of
WEBKIT_MAKE_FORWARDING_HEADERS. Accept absolute paths for FILES
parameter.

Source/JavaScriptCore:

* CMakeLists.txt: Do not use DERIVED_SOURCE_DIRECTORIES parameter
of WEBKIT_MAKE_FORWARDING_HEADERS. Added generated headers to
JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS.

Source/WebCore:

No new tests because no behavior changes.

* PlatformWin.cmake: Do not use DERIVED_SOURCE_DIRECTORIES of
WEBKIT_MAKE_FORWARDING_HEADERS. Added
WebCore_PRIVATE_FRAMEWORK_HEADERS.
* WebCoreMacros.cmake (GENERATE_DOM_NAMES): Added
${_namespace}ElementTypeHelpers.h to _outputfiles.

Source/WebKitLegacy:

* PlatformWin.cmake: Do not use DERIVED_SOURCE_DIRECTORIES
parameter of WEBKIT_MAKE_FORWARDING_HEADERS. Added
WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS.

Tools:

* TestWebKitAPI/PlatformGTK.cmake: Removed the workaround of using an intermediate target.
* TestWebKitAPI/PlatformWPE.cmake: Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCoreMacroscmake">trunk/Source/WebCore/WebCoreMacros.cmake</a></li>
<li><a href="#trunkSourceWebKitLegacyChangeLog">trunk/Source/WebKitLegacy/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacyPlatformWincmake">trunk/Source/WebKitLegacy/PlatformWin.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWPEcmake">trunk/Tools/TestWebKitAPI/PlatformWPE.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog  2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/ChangeLog     2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2019-04-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake] WEBKIT_MAKE_FORWARDING_HEADERS shouldn't use POST_BUILD to copy generated headers
+        https://bugs.webkit.org/show_bug.cgi?id=182757
+
+        Reviewed by Don Olmstead.
+
+        Some generated headers need to be exported to its client modules.
+        Before this change, WEBKIT_MAKE_FORWARDING_HEADERS copies all *.h
+        files in the directory specified by DERIVED_SOURCE_DIRECTORIES
+        parameter. The copy operation was triggered by POST_BUILD event.
+
+        This caused build dependency issues for Ninja builds. This change
+        remove the DERIVED_SOURCE_DIRECTORIES parameter. And list all
+        generated headers explicitly which need to be copied.
+
+        * Source/cmake/WebKitMacros.cmake: Removed
+        DERIVED_SOURCE_DIRECTORIES parameter of
+        WEBKIT_MAKE_FORWARDING_HEADERS. Accept absolute paths for FILES
+        parameter.
+
</ins><span class="cx"> 2019-04-01  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [CMake] Remove EXTRA_DIRECTORIES parameter of WEBKIT_MAKE_FORWARDING_HEADERS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt       2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt  2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -399,6 +399,13 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
</span><ins>+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
+
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h
+
</ins><span class="cx">     API/APICallbackFunction.h
</span><span class="cx">     API/APICast.h
</span><span class="cx">     API/APIUtils.h
</span><span class="lines">@@ -1274,7 +1281,6 @@
</span><span class="cx"> WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
</span><span class="cx">     TARGET_NAME JavaScriptCorePrivateForwardingHeaders
</span><span class="cx">     FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
</span><del>-    DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_DIR}/JavaScriptCore ${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector
</del><span class="cx">     FLATTENED
</span><span class="cx"> )
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-04-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake] WEBKIT_MAKE_FORWARDING_HEADERS shouldn't use POST_BUILD to copy generated headers
+        https://bugs.webkit.org/show_bug.cgi?id=182757
+
+        Reviewed by Don Olmstead.
+
+        * CMakeLists.txt: Do not use DERIVED_SOURCE_DIRECTORIES parameter
+        of WEBKIT_MAKE_FORWARDING_HEADERS. Added generated headers to
+        JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS.
+
</ins><span class="cx"> 2019-04-02  Saam barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add a ValueRepReduction phase
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/WebCore/ChangeLog      2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-04-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake] WEBKIT_MAKE_FORWARDING_HEADERS shouldn't use POST_BUILD to copy generated headers
+        https://bugs.webkit.org/show_bug.cgi?id=182757
+
+        Reviewed by Don Olmstead.
+
+        No new tests because no behavior changes.
+
+        * PlatformWin.cmake: Do not use DERIVED_SOURCE_DIRECTORIES of
+        WEBKIT_MAKE_FORWARDING_HEADERS. Added
+        WebCore_PRIVATE_FRAMEWORK_HEADERS.
+        * WebCoreMacros.cmake (GENERATE_DOM_NAMES): Added
+        ${_namespace}ElementTypeHelpers.h to _outputfiles.
+
</ins><span class="cx"> 2019-04-02  Cathie Chen  <cathiechen@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Update the status of ResizeObserver in features.json.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake   2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/WebCore/PlatformWin.cmake      2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -320,12 +320,47 @@
</span><span class="cx">     )
</span><span class="cx"> endif ()
</span><span class="cx"> 
</span><ins>+set(WebCore_PRIVATE_FRAMEWORK_HEADERS
+    ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/EventInterfaces.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/EventTargetInterfaces.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLElementTypeHelpers.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/HTMLNames.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/HTTPHeaderNames.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSBlob.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSCSSStyleDeclaration.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSDOMBindingInternalsBuiltins.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSDOMWindow.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSDocument.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSElement.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSEventTarget.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSFile.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSHTMLElement.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSNode.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSNotification.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSRange.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSReadableStream.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/JSReadableStreamDefaultController.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/RTCPeerConnectionInternalsBuiltins.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/ReadableByteStreamInternalsBuiltins.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/ReadableStreamInternalsBuiltins.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/Settings.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/StreamInternalsBuiltins.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitFontFamilyNames.h
+    ${DERIVED_SOURCES_WEBCORE_DIR}/WritableStreamInternalsBuiltins.h
+)
+
</ins><span class="cx"> WEBKIT_MAKE_FORWARDING_HEADERS(WebCore
</span><ins>+    FILES ${WebCore_PRIVATE_FRAMEWORK_HEADERS}
</ins><span class="cx">     DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES}
</span><del>-    DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_WEBCORE_DIR}
</del><span class="cx">     FLATTENED
</span><span class="cx"> )
</span><span class="cx"> 
</span><ins>+add_dependencies(WebCoreForwardingHeaders WebCoreBindings)
+
</ins><span class="cx"> set(WebCore_OUTPUT_NAME
</span><span class="cx">     WebCore${DEBUG_SUFFIX}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCoreMacros.cmake (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCoreMacros.cmake 2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/WebCore/WebCoreMacros.cmake    2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (_tags)
</span><span class="cx">         set(_arguments "${_arguments}" --tags ${_tags} --factory --wrapperFactory)
</span><del>-        set(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.h)
</del><ins>+        set(_outputfiles "${_outputfiles}" ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementFactory.h ${DERIVED_SOURCES_WEBCORE_DIR}/${_namespace}ElementTypeHelpers.h ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/JS${_namespace}ElementWrapperFactory.h)
</ins><span class="cx">     endif ()
</span><span class="cx"> 
</span><span class="cx">     if (_extradef)
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/ChangeLog (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/ChangeLog      2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-04-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake] WEBKIT_MAKE_FORWARDING_HEADERS shouldn't use POST_BUILD to copy generated headers
+        https://bugs.webkit.org/show_bug.cgi?id=182757
+
+        Reviewed by Don Olmstead.
+
+        * PlatformWin.cmake: Do not use DERIVED_SOURCE_DIRECTORIES
+        parameter of WEBKIT_MAKE_FORWARDING_HEADERS. Added
+        WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS.
+
</ins><span class="cx"> 2019-03-13  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Check IDB quota usage through QuotaManager
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/PlatformWin.cmake      2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -478,10 +478,16 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces)
</span><span class="cx"> 
</span><ins>+set(WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces/WebKit.h
+
+    win/CFDictionaryPropertyBag.h
+    win/WebKitCOMAPI.h
+)
+
</ins><span class="cx"> WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacyGUID
</span><span class="cx">     DESTINATION ${FORWARDING_HEADERS_DIR}/WebKitLegacy
</span><del>-    FILES win/WebKitCOMAPI.h win/CFDictionaryPropertyBag.h
-    DERIVED_SOURCE_DIRECTORIES ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/Interfaces
</del><ins>+    FILES ${WebKitLegacyGUID_PRIVATE_FRAMEWORK_HEADERS}
</ins><span class="cx">     FLATTENED
</span><span class="cx"> )
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake    2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Source/cmake/WebKitMacros.cmake       2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
</span><span class="cx">     set(options FLATTENED)
</span><span class="cx">     set(oneValueArgs DESTINATION TARGET_NAME)
</span><del>-    set(multiValueArgs DIRECTORIES DERIVED_SOURCE_DIRECTORIES FILES)
</del><ins>+    set(multiValueArgs DIRECTORIES FILES)
</ins><span class="cx">     cmake_parse_arguments(opt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
</span><span class="cx">     set(headers ${opt_FILES})
</span><span class="cx">     if (opt_DESTINATION)
</span><span class="lines">@@ -251,6 +251,11 @@
</span><span class="cx">     endforeach ()
</span><span class="cx">     set(fwd_headers)
</span><span class="cx">     foreach (header IN LISTS headers)
</span><ins>+        if (IS_ABSOLUTE ${header})
+            set(src_header ${header})
+        else ()
+            set(src_header ${CMAKE_CURRENT_SOURCE_DIR}/${header})
+        endif ()
</ins><span class="cx">         if (opt_FLATTENED)
</span><span class="cx">             get_filename_component(header_filename ${header} NAME)
</span><span class="cx">             set(fwd_header ${destination}/${header_filename})
</span><span class="lines">@@ -260,7 +265,7 @@
</span><span class="cx">             set(fwd_header ${destination}/${header})
</span><span class="cx">         endif ()
</span><span class="cx">         add_custom_command(OUTPUT ${fwd_header}
</span><del>-            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${header} ${fwd_header}
</del><ins>+            COMMAND ${CMAKE_COMMAND} -E copy ${src_header} ${fwd_header}
</ins><span class="cx">             MAIN_DEPENDENCY ${header}
</span><span class="cx">             VERBATIM
</span><span class="cx">         )
</span><span class="lines">@@ -273,27 +278,6 @@
</span><span class="cx">     endif ()
</span><span class="cx">     add_custom_target(${target_name} DEPENDS ${fwd_headers})
</span><span class="cx">     add_dependencies(${framework} ${target_name})
</span><del>-    if (opt_DERIVED_SOURCE_DIRECTORIES)
-        set(script ${CMAKE_CURRENT_BINARY_DIR}/makeForwardingHeaders.cmake)
-        set(content "")
-        foreach (dir IN LISTS opt_DERIVED_SOURCE_DIRECTORIES)
-            string(CONCAT content ${content}
-                "file(GLOB headers \"${dir}/*.h\")\n"
-                "foreach (header IN LISTS headers)\n"
-                "    get_filename_component(header_filename \${header} NAME)\n"
-                "    execute_process(COMMAND \${CMAKE_COMMAND} -E copy_if_different \${header} ${destination}/\${header_filename} RESULT_VARIABLE result)\n"
-                "    if (NOT \${result} EQUAL 0)\n"
-                "        message(FATAL_ERROR \"Failed to copy \${header}: \${result}\")\n"
-                "    endif ()\n"
-                "endforeach ()\n"
-            )
-        endforeach ()
-        file(WRITE ${script} ${content})
-        add_custom_command(TARGET ${framework} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -P ${script}
-            VERBATIM
-        )
-    endif ()
</del><span class="cx"> endfunction()
</span><span class="cx"> 
</span><span class="cx"> # Helper macros for debugging CMake problems.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Tools/ChangeLog       2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-04-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake] WEBKIT_MAKE_FORWARDING_HEADERS shouldn't use POST_BUILD to copy generated headers
+        https://bugs.webkit.org/show_bug.cgi?id=182757
+
+        Reviewed by Don Olmstead.
+
+        * TestWebKitAPI/PlatformGTK.cmake: Removed the workaround of using an intermediate target.
+        * TestWebKitAPI/PlatformWPE.cmake: Ditto.
+
</ins><span class="cx"> 2019-04-01  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         run-api-tests: Upload test results
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake      2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -133,10 +133,6 @@
</span><span class="cx"> set_tests_properties(TestJSC PROPERTIES TIMEOUT 60)
</span><span class="cx"> set_target_properties(TestJSC PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)
</span><span class="cx"> 
</span><del>-# Add an intermediate target between TestJSC and JavaScriptCore to ensure derived headers are copied into the forwarding header directory.
-add_custom_target(pre-TestJSC DEPENDS JavaScriptCore)
-add_dependencies(TestJSC pre-TestJSC)
-
</del><span class="cx"> if (COMPILER_IS_GCC_OR_CLANG)
</span><span class="cx">     WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebKit -Wno-sign-compare
</span><span class="cx">                                            -Wno-undef
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWPEcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (243745 => 243746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake      2019-04-02 16:23:22 UTC (rev 243745)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2019-04-02 16:33:02 UTC (rev 243746)
</span><span class="lines">@@ -114,10 +114,6 @@
</span><span class="cx"> set_tests_properties(TestJSC PROPERTIES TIMEOUT 60)
</span><span class="cx"> set_target_properties(TestJSC PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/JavaScriptCore)
</span><span class="cx"> 
</span><del>-# Add an intermediate target between TestJSC and JavaScriptCore to ensure derived headers are copied into the forwarding header directory.
-add_custom_target(pre-TestJSC DEPENDS JavaScriptCore)
-add_dependencies(TestJSC pre-TestJSC)
-
</del><span class="cx"> if (COMPILER_IS_GCC_OR_CLANG)
</span><span class="cx">     WEBKIT_ADD_TARGET_CXX_FLAGS(TestWebCore -Wno-sign-compare
</span><span class="cx">                                             -Wno-undef
</span></span></pre>
</div>
</div>

</body>
</html>