<!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>[187161] 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/187161">187161</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 10:04:03 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix quirks in CMake build on Mac and Windows
https://bugs.webkit.org/show_bug.cgi?id=147174
Reviewed by Gyuyoung Kim.
.:
* CMakeLists.txt:
* Source/cmake/OptionsWindows.cmake:
Added options I removed in <a href="http://trac.webkit.org/projects/webkit/changeset/187022">r187022</a>. They are indeed needed.
* Source/cmake/WebKitFS.cmake:
Make the DerivedSources/WebKit directory.
Source/JavaScriptCore:
* PlatformMac.cmake:
Add JSRemoteInspector.cpp and remove semicolon from command to make it actually run.
Source/WebCore:
* PlatformMac.cmake:
Removed files that don't exist any more.
* platform/win/WindowsTouch.h:
Only use definitions of touch structures when compiling with VS2012.
Source/WebKit:
* PlatformMac.cmake:
Fixed syntax, removed files that don't exist any more.
Source/WebKit/win:
* WebView.cpp:
Include winuser.h to get definitions of touch-related structures like tagGESTUREINFO.
Tools:
* CMakeLists.txt:
Don't build DumpRenderTree with CMake for now (until we get that working).
* WinLauncher/CMakeLists.txt:
Renamed WinLauncherLauncher to WinLauncher and WinLauncher to WinLauncherLib to match the Visual Studio build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWindowsTouchh">trunk/Source/WebCore/platform/win/WindowsTouch.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFScmake">trunk/Source/cmake/WebKitFS.cmake</a></li>
<li><a href="#trunkToolsCMakeListstxt">trunk/Tools/CMakeLists.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWinLauncherCMakeListstxt">trunk/Tools/WinLauncher/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/CMakeLists.txt 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
</span><span class="cx"> set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
</span><span class="cx"> set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
</span><ins>+set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
</ins><span class="cx"> set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
</span><span class="cx"> set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
</span><span class="cx"> set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/ChangeLog 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-22 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks in CMake build on Mac and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147174
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsWindows.cmake:
+ Added options I removed in r187022. They are indeed needed.
+ * Source/cmake/WebKitFS.cmake:
+ Make the DerivedSources/WebKit directory.
+
</ins><span class="cx"> 2015-07-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.9.4 release.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-22 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks in CMake build on Mac and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147174
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformMac.cmake:
+ Add JSRemoteInspector.cpp and remove semicolon from command to make it actually run.
+
</ins><span class="cx"> 2015-07-21 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add newTarget accessor to JS constructor written in C++
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> API/JSAPIWrapperObject.mm
</span><span class="cx"> API/JSContext.mm
</span><span class="cx"> API/JSManagedValue.mm
</span><ins>+ API/JSRemoteInspector.cpp
</ins><span class="cx"> API/JSStringRefCF.cpp
</span><span class="cx"> API/JSValue.mm
</span><span class="cx"> API/JSVirtualMachine.mm
</span><span class="lines">@@ -29,7 +30,7 @@
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
</span><span class="cx"> DEPENDS ${JAVASCRIPTCORE_DIR}/runtime/Tracing.d
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
</span><del>- COMMAND dtrace -h -o "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h" -s "${JAVASCRIPTCORE_DIR}/runtime/Tracing.d";
</del><ins>+ COMMAND dtrace -h -o "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h" -s "${JAVASCRIPTCORE_DIR}/runtime/Tracing.d"
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebCore/ChangeLog 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-22 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks in CMake build on Mac and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147174
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformMac.cmake:
+ Removed files that don't exist any more.
+ * platform/win/WindowsTouch.h:
+ Only use definitions of touch structures when compiling with VS2012.
+
</ins><span class="cx"> 2015-07-22 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix cast-align warning in NetworkStateNotifierEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -188,12 +188,6 @@
</span><span class="cx"> platform/graphics/ca/TileGrid.cpp
</span><span class="cx"> platform/graphics/ca/TransformationMatrixCA.cpp
</span><span class="cx">
</span><del>- platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp
- platform/graphics/ca/mac/PlatformCAAnimationMac.mm
- platform/graphics/ca/mac/PlatformCAFiltersMac.mm
- platform/graphics/ca/mac/PlatformCALayerMac.mm
- platform/graphics/ca/mac/WebTiledBackingLayer.mm
-
</del><span class="cx"> platform/graphics/cg/BitmapImageCG.cpp
</span><span class="cx"> platform/graphics/cg/ColorCG.cpp
</span><span class="cx"> platform/graphics/cg/FloatPointCG.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWindowsTouchh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WindowsTouch.h (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WindowsTouch.h 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebCore/platform/win/WindowsTouch.h 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -71,6 +71,9 @@
</span><span class="cx"> #define GC_PRESSANDTAP 0x00000001
</span><span class="cx"> #define GC_ROLLOVER GC_PRESSANDTAP
</span><span class="cx">
</span><ins>+// When building with CMake, we have the correct WINVER, so we do not need these definitions to soft link with user32.dll.
+#if !defined(BUILDING_WITH_CMAKE)
+
</ins><span class="cx"> // GESTUREINFO struct definition
</span><span class="cx"> typedef struct tagGESTUREINFO {
</span><span class="cx"> UINT cbSize; // size, in bytes, of this structure (including variable length Args field)
</span><span class="lines">@@ -110,3 +113,5 @@
</span><span class="cx"> DECLARE_HANDLE(HGESTUREINFO);
</span><span class="cx">
</span><span class="cx"> #endif
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebKit/ChangeLog 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-22 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks in CMake build on Mac and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147174
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformMac.cmake:
+ Fixed syntax, removed files that don't exist any more.
+
</ins><span class="cx"> 2015-07-20 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Certain Debug builds can take close to 3 hours to link
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
</span><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
</span><del>-else if ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
</del><ins>+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
</ins><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
</span><span class="cx"> else ()
</span><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
</span><span class="lines">@@ -138,11 +138,9 @@
</span><span class="cx"> mac/Misc/WebKitLogging.m
</span><span class="cx"> mac/Misc/WebKitNSStringExtras.mm
</span><span class="cx"> mac/Misc/WebKitStatistics.m
</span><del>- mac/Misc/WebKitSystemBits.m
</del><span class="cx"> mac/Misc/WebKitVersionChecks.m
</span><span class="cx"> mac/Misc/WebLocalizableStrings.mm
</span><span class="cx"> mac/Misc/WebLocalizableStringsInternal.mm
</span><del>- mac/Misc/WebNSArrayExtras.m
</del><span class="cx"> mac/Misc/WebNSControlExtras.m
</span><span class="cx"> mac/Misc/WebNSDataExtras.m
</span><span class="cx"> mac/Misc/WebNSDictionaryExtras.m
</span><span class="lines">@@ -179,7 +177,6 @@
</span><span class="cx"> mac/Plugins/WebPluginDatabase.mm
</span><span class="cx"> mac/Plugins/WebPluginPackage.mm
</span><span class="cx"> mac/Plugins/WebPluginRequest.m
</span><del>- mac/Plugins/WebPluginsPrivate.m
</del><span class="cx"> mac/Plugins/npapi.mm
</span><span class="cx">
</span><span class="cx"> mac/Plugins/Hosted/HostedNetscapePluginStream.mm
</span><span class="lines">@@ -228,7 +225,6 @@
</span><span class="cx"> mac/WebCoreSupport/WebSecurityOrigin.mm
</span><span class="cx"> mac/WebCoreSupport/WebSystemInterface.mm
</span><span class="cx"> mac/WebCoreSupport/WebUserMediaClient.mm
</span><del>- mac/WebCoreSupport/WebViewGroup.mm
</del><span class="cx">
</span><span class="cx"> mac/WebInspector/WebInspector.mm
</span><span class="cx"> mac/WebInspector/WebInspectorFrontend.mm
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebKit/win/ChangeLog 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-22 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks in CMake build on Mac and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147174
+
+ Reviewed by Gyuyoung Kim.
+
+ * WebView.cpp:
+ Include winuser.h to get definitions of touch-related structures like tagGESTUREINFO.
+
</ins><span class="cx"> 2015-07-21 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [Win] Add needTouchEvents() stub to WebChromeClient.h for a successful build with ENABLE_TOUCH_EVENTS=ON
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> #include <oleacc.h>
</span><span class="cx"> #include <wchar.h>
</span><span class="cx"> #include <windowsx.h>
</span><ins>+#include <winuser.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -21,6 +21,8 @@
</span><span class="cx"> /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
</span><span class="cx"> /MP
</span><span class="cx"> )
</span><ins>+ string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
+ string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(PORT Win)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFScmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFS.cmake (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFS.cmake 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Source/cmake/WebKitFS.cmake 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -13,4 +13,5 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT)
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
</span><ins>+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
</ins><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CMakeLists.txt (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CMakeLists.txt 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Tools/CMakeLists.txt 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (WIN32)
</span><del>- add_subdirectory(DumpRenderTree)
</del><ins>+ # FIXME: Get DumpRenderTree working with CMake.
</ins><span class="cx"> add_subdirectory(WinLauncher)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Tools/ChangeLog 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-22 Alex Christensen <achristensen@webkit.org>
+
+ Fix quirks in CMake build on Mac and Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147174
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt:
+ Don't build DumpRenderTree with CMake for now (until we get that working).
+ * WinLauncher/CMakeLists.txt:
+ Renamed WinLauncherLauncher to WinLauncher and WinLauncher to WinLauncherLib to match the Visual Studio build.
+
</ins><span class="cx"> 2015-07-22 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [check-webkit-style] .lut.h files shouldn't raise a sorting issue
</span></span></pre></div>
<a id="trunkToolsWinLauncherCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/CMakeLists.txt (187160 => 187161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-07-22 16:08:03 UTC (rev 187160)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-07-22 17:04:03 UTC (rev 187161)
</span><span class="lines">@@ -38,13 +38,16 @@
</span><span class="cx">
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
</span><span class="cx">
</span><del>-add_definitions(-D_UNICODE -DWIN_CAIRO)
</del><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+add_definitions(-D_UNICODE)
</ins><span class="cx"> include_directories(${WinLauncher_INCLUDE_DIRECTORIES})
</span><del>-add_library(WinLauncher SHARED ${WinLauncher_SOURCES})
-target_link_libraries(WinLauncher ${WinLauncher_LIBRARIES})
</del><ins>+add_library(WinLauncherLib SHARED ${WinLauncher_SOURCES})
+target_link_libraries(WinLauncherLib ${WinLauncher_LIBRARIES})
+set_target_properties(WinLauncherLib PROPERTIES FOLDER "Tools")
+
+add_executable(WinLauncher WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp WinLauncher.vcxproj/WinLauncher.rc)
+target_link_libraries(WinLauncher shlwapi)
</ins><span class="cx"> set_target_properties(WinLauncher PROPERTIES FOLDER "Tools")
</span><del>-
-add_executable(WinLauncherLauncher WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp WinLauncher.vcxproj/WinLauncher.rc)
-target_link_libraries(WinLauncherLauncher shlwapi)
-set_target_properties(WinLauncherLauncher PROPERTIES FOLDER "Tools")
-set_target_properties(WinLauncherLauncher PROPERTIES OUTPUT_NAME "WinLauncher")
</del><ins>+set_target_properties(WinLauncher PROPERTIES OUTPUT_NAME "WinLauncher")
</ins></span></pre>
</div>
</div>
</body>
</html>