<!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>[196947] 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/196947">196947</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-22 11:32:47 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
https://bugs.webkit.org/show_bug.cgi?id=154450
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-02-22
Reviewed by Alex Christensen.
.:
* Source/cmake/WebKitMacros.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
Source/WebCore:
No new tests needed.
* CMakeLists.txt:
Source/WebKit:
* CMakeLists.txt:
Source/WebKit2:
* CMakeLists.txt: Used WebKit2_SOURCES variable instead of separate
WebKit2_DERIVED_SOURCES for compatibility with WEBKIT_FRAMEWORK macro.
There is no real need to separate derived sources from others.
* PlatformGTK.cmake: Ditto.
Source/WTF:
* wtf/CMakeLists.txt:</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="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/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 (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2016-02-18 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Bump internal jhbuild versions to 1.6.3
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1310,12 +1310,7 @@
</span><span class="cx"> add_subdirectory(shell)
</span><span class="cx">
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
</span><del>-include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
-target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES})
-set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
-set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")
</del><ins>+WEBKIT_FRAMEWORK(JavaScriptCore)
</ins><span class="cx">
</span><span class="cx"> if (JavaScriptCore_PRE_BUILD_COMMAND)
</span><span class="cx"> add_custom_command(TARGET JavaScriptCore PRE_BUILD COMMAND ${JavaScriptCore_PRE_BUILD_COMMAND} VERBATIM)
</span><span class="lines">@@ -1325,10 +1320,6 @@
</span><span class="cx"> add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (JavaScriptCore_OUTPUT_NAME)
- set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})
-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 class="lines">@@ -1339,5 +1330,3 @@
</span><span class="cx">
</span><span class="cx"> add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
</span><span class="cx"> add_dependencies(JavaScriptCore stageSharedScripts)
</span><del>-
-WEBKIT_FRAMEWORK(JavaScriptCore)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2016-02-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r196891.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WTF/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * wtf/CMakeLists.txt:
+
</ins><span class="cx"> 2016-02-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Use of inlined asm statements causes problems for -std=c99 builds.
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -284,12 +284,7 @@
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
</span><del>-include_directories(${WTF_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES})
-add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
-target_link_libraries(WTF ${WTF_LIBRARIES})
-set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
-set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")
</del><ins>+WEBKIT_FRAMEWORK(WTF)
</ins><span class="cx">
</span><span class="cx"> if (MSVC)
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
</span><span class="lines">@@ -299,9 +294,3 @@
</span><span class="cx"> if (WTF_PRE_BUILD_COMMAND)
</span><span class="cx"> add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
</span><span class="cx"> endif ()
</span><del>-
-if (WTF_OUTPUT_NAME)
- set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
-endif ()
-
-WEBKIT_FRAMEWORK(WTF)
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -3771,16 +3771,11 @@
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
</span><span class="cx">
</span><del>-include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
-
</del><span class="cx"> if (MSVC)
</span><span class="cx"> ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
-set_target_properties(WebCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebCore")
-set_target_properties(WebCore PROPERTIES FOLDER "WebCore")
</del><ins>+WEBKIT_FRAMEWORK(WebCore)
</ins><span class="cx">
</span><span class="cx"> # The -ftree-sra optimization (implicit with -O2) causes crashes when
</span><span class="cx"> # allocating large chunks of memory using bmalloc on Intel 32bit.
</span><span class="lines">@@ -3799,14 +3794,11 @@
</span><span class="cx"> add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WebCore_OUTPUT_NAME)
- set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
-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 class="cx">
</span><ins>+include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
</ins><span class="cx"> add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
</span><span class="cx"> add_dependencies(WebCoreTestSupport WebCore)
</span><span class="cx"> target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
</span><span class="lines">@@ -3848,5 +3840,3 @@
</span><span class="cx"> if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND WTF_CPU_ARM AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.9") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.3"))
</span><span class="cx"> set_source_files_properties(svg/SVGPathElement.cpp PROPERTIES COMPILE_FLAGS "-O2")
</span><span class="cx"> endif ()
</span><del>-
-WEBKIT_FRAMEWORK(WebCore)
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebCore/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><ins>+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ No new tests needed.
+
+ * CMakeLists.txt:
+
+2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
+
</ins><span class="cx"> Workaround for ICE in GCC 4.8 appeared in r196846.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154535
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -27,25 +27,15 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><del>-include_directories(${WebKit_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
-
</del><span class="cx"> if (MSVC)
</span><span class="cx"> ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
</span><span class="cx"> list(APPEND WebKit_SOURCES win/WebKit.resources/WebKit.rc)
</span><span class="cx"> add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKit)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
</del><ins>+WEBKIT_FRAMEWORK(WebKit)
+
</ins><span class="cx"> add_dependencies(WebKit WebCore)
</span><span class="cx"> if (WIN32)
</span><span class="cx"> add_dependencies(WebKit WebKitGUID)
</span><span class="cx"> endif ()
</span><del>-target_link_libraries(WebKit ${WebKit_LIBRARIES})
-set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
-
-if (WebKit_OUTPUT_NAME)
- set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
-endif ()
-
-WEBKIT_FRAMEWORK(WebKit)
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+
</ins><span class="cx"> 2016-02-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix internal Windows build of projects built after WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -770,14 +770,9 @@
</span><span class="cx">
</span><span class="cx"> GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
</span><span class="cx">
</span><del>-include_directories(${WebKit2_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
-add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES})
-
</del><ins>+WEBKIT_FRAMEWORK(WebKit2)
</ins><span class="cx"> add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
</span><span class="cx"> add_webkit2_prefix_header(WebKit2)
</span><del>-target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
-set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
</del><span class="cx">
</span><span class="cx"> # Suppress unused parameter warnings for sources in WebKit2.
</span><span class="cx"> ADD_TARGET_PROPERTIES(WebKit2 COMPILE_FLAGS "-Wno-unused-parameter")
</span><span class="lines">@@ -786,10 +781,6 @@
</span><span class="cx"> ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WebKit2_OUTPUT_NAME)
- set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME})
-endif ()
-
</del><span class="cx"> add_executable(WebProcess ${WebProcess_SOURCES})
</span><span class="cx"> add_webkit2_prefix_header(WebProcess)
</span><span class="cx"> target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
</span><span class="lines">@@ -837,9 +828,7 @@
</span><span class="cx"> POPULATE_LIBRARY_VERSION(WEBKIT2)
</span><span class="cx"> set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
</span><span class="cx">
</span><del>-if (APPLE)
- WEBKIT_FRAMEWORK(WebKit2)
-else ()
</del><ins>+if (NOT APPLE)
</ins><span class="cx"> install(TARGETS WebKit2 WebProcess NetworkProcess
</span><span class="cx"> LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
</span><span class="cx"> RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
+ https://bugs.webkit.org/show_bug.cgi?id=154450
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Used WebKit2_SOURCES variable instead of separate
+ WebKit2_DERIVED_SOURCES for compatibility with WEBKIT_FRAMEWORK macro.
+ There is no real need to separate derived sources from others.
+ * PlatformGTK.cmake: Ditto.
+
</ins><span class="cx"> 2016-02-22 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Unreviewed build fix after r196942.
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (196946 => 196947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-02-22 19:26:48 UTC (rev 196946)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-02-22 19:32:47 UTC (rev 196947)
</span><span class="lines">@@ -243,6 +243,21 @@
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> macro(WEBKIT_FRAMEWORK _target)
</span><ins>+ include_directories(${${_target}_INCLUDE_DIRECTORIES})
+ include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
+ add_library(${_target} ${${_target}_LIBRARY_TYPE}
+ ${${_target}_HEADERS}
+ ${${_target}_SOURCES}
+ ${${_target}_DERIVED_SOURCES}
+ )
+ target_link_libraries(${_target} ${${_target}_LIBRARIES})
+ set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
+ set_target_properties(${_target} PROPERTIES FOLDER "${_target}")
+
+ if (${_target}_OUTPUT_NAME)
+ set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
+ 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>