<!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>[197056] 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/197056">197056</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-24 15:47:25 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
https://bugs.webkit.org/show_bug.cgi?id=154651
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-02-24
Reviewed by Alex Christensen.
.:
* Source/cmake/WebKitMacros.cmake:
Source/JavaScriptCore:
* CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
Source/WebCore:
No new tests needed.
* CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
Source/WTF:
* CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.</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="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-24 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -1312,14 +1312,6 @@
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
</span><span class="cx"> WEBKIT_FRAMEWORK(JavaScriptCore)
</span><span class="cx">
</span><del>-if (JavaScriptCore_PRE_BUILD_COMMAND)
- add_custom_command(TARGET JavaScriptCore PRE_BUILD COMMAND ${JavaScriptCore_PRE_BUILD_COMMAND} VERBATIM)
-endif ()
-
-if (JavaScriptCore_POST_BUILD_COMMAND)
- add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
-endif ()
-
</del><span class="cx"> if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
</span><span class="cx"> POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
</span><span class="cx"> set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-24 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
+
</ins><span class="cx"> 2016-02-24 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r197033.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WTF/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-24 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
+
</ins><span class="cx"> 2016-02-23 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Xcode] Linker errors display mangled names, but no longer should
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -290,7 +290,3 @@
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
</span><span class="cx"> endif ()
</span><del>-
-if (WTF_PRE_BUILD_COMMAND)
- add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
-endif ()
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -3788,15 +3788,6 @@
</span><span class="cx"> ADD_TARGET_PROPERTIES(WebCore COMPILE_FLAGS "-fno-tree-sra")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WebCore_PRE_BUILD_COMMAND)
- add_custom_target(WebCorePreBuild COMMAND ${WebCore_PRE_BUILD_COMMAND} VERBATIM)
- add_dependencies(WebCore WebCorePreBuild)
-endif ()
-
-if (WebCore_POST_BUILD_COMMAND)
- add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
-endif ()
-
</del><span class="cx"> if (MSVC)
</span><span class="cx"> ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-24 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
+ https://bugs.webkit.org/show_bug.cgi?id=154651
+
+ Reviewed by Alex Christensen.
+
+ No new tests needed.
+
+ * CMakeLists.txt: Moved shared code to WEBKIT_FRAMEWORK macro.
+
</ins><span class="cx"> 2016-02-24 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use more references in FocusNavigationScope
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (197055 => 197056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-02-24 23:37:51 UTC (rev 197055)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-02-24 23:47:25 UTC (rev 197056)
</span><span class="lines">@@ -258,6 +258,14 @@
</span><span class="cx"> set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+ if (${_target}_PRE_BUILD_COMMAND)
+ add_custom_command(TARGET ${_target} PRE_BUILD COMMAND ${${_target}_PRE_BUILD_COMMAND} VERBATIM)
+ endif ()
+
+ if (${_target}_POST_BUILD_COMMAND)
+ add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM)
+ endif ()
+
</ins><span class="cx"> if (APPLE AND NOT PORT STREQUAL "GTK")
</span><span class="cx"> set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
</span><span class="cx"> install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
</span></span></pre>
</div>
</div>
</body>
</html>