<!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>[190421] trunk/Source</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/190421">190421</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-10-01 11:47:58 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed CMake build fixes.
Source/WebCore:
* CMakeLists.txt: Match original Windows build flags for WebCoreTest.
* PlatformAppleWin.cmake: Use the same build defines as the
original Windows build.
Source/WebKit:
* CMakeLists.txt: Set the same build definitions as the original
project file.
* PlatformWin.cmake: Remove some soft-linked files from the static
link commands. Set build flags to match original project files.
Source/WTF:
* wtf/CMakeLists.txt: Correct build flags to match
the original project files.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorePlatformAppleWincmake">trunk/Source/WebCore/PlatformAppleWin.cmake</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="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WTF/ChangeLog 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed CMake build fixes.
+
+ * wtf/CMakeLists.txt: Correct build flags to match
+ the original project files.
+
</ins><span class="cx"> 2015-09-30 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r190324.
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -276,6 +276,11 @@
</span><span class="cx"> set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
</span><span class="cx"> set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")
</span><span class="cx">
</span><ins>+if (MSVC)
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
+endif ()
+
</ins><span class="cx"> if (WTF_POST_BUILD_COMMAND)
</span><span class="cx"> add_custom_command(TARGET WTF POST_BUILD COMMAND ${WTF_POST_BUILD_COMMAND} VERBATIM)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -3705,6 +3705,9 @@
</span><span class="cx">
</span><span class="cx"> if (WebCoreTestSupport_OUTPUT_NAME)
</span><span class="cx"> set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
</span><ins>+ if (MSVC)
+ add_compile_options(/GF- /WX-)
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WebCore/ChangeLog 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed CMake build fixes.
+
+ * CMakeLists.txt: Match original Windows build flags for WebCoreTest.
+ * PlatformAppleWin.cmake: Use the same build defines as the
+ original Windows build.
+
</ins><span class="cx"> 2015-09-30 João Oliveira <hello@jxs.pt>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Adjust font size of Developer Tools using Command,+ or Command,-
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformAppleWin.cmake 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -1,3 +1,6 @@
</span><ins>+add_definitions(-DQUARTZCORE_DLL -DDISABLE_COREIMAGE -DDISABLE_FRONTEND -DDISABLE_IOSURFACE -DDISABLE_RENDERSERVER
+ -DDISABLE_3D_TRANSFORMS -DWEBCORE_CONTEXT_MENUS -DPSAPI_VERSION=1)
+
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include"
</span><span class="cx"> "${WEBKIT_LIBRARIES_DIR}/include/zlib"
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><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><ins>+ add_definitions(/DWEBKIT_EXPORTS /DFRAMEWORK_NAME=WebKit)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WebKit/ChangeLog 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed CMake build fixes.
+
+ * CMakeLists.txt: Set the same build definitions as the original
+ project file.
+ * PlatformWin.cmake: Remove some soft-linked files from the static
+ link commands. Set build flags to match original project files.
+
</ins><span class="cx"> 2015-09-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an IDB Server that can roundtrip a request back to the client.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -22,22 +22,12 @@
</span><span class="cx"> win/WebURLAuthenticationChallengeSenderCFNet.cpp
</span><span class="cx"> )
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><del>- PRIVATE ASL${DEBUG_SUFFIX}
- PRIVATE AVFoundationCF${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE CFNetwork${DEBUG_SUFFIX}
</span><del>- PRIVATE CoreAudioToolbox${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE CoreFoundation${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE CoreGraphics${DEBUG_SUFFIX}
</span><del>- PRIVATE CoreMedia${DEBUG_SUFFIX}
- PRIVATE CoreText${DEBUG_SUFFIX}
- PRIVATE CoreVideo${DEBUG_SUFFIX}
- PRIVATE MediaAccessibility${DEBUG_SUFFIX}
- PRIVATE QuartzCore${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE SQLite3${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}
</span><del>- PRIVATE WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE libdispatch${DEBUG_SUFFIX}
</span><del>- PRIVATE libexslt${DEBUG_SUFFIX}
</del><span class="cx"> PRIVATE libicuin${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE libicuuc${DEBUG_SUFFIX}
</span><span class="cx"> PRIVATE libxml2${DEBUG_SUFFIX}
</span><span class="lines">@@ -452,6 +442,9 @@
</span><span class="cx">
</span><span class="cx"> set(WebKit_LIBRARY_TYPE SHARED)
</span><span class="cx">
</span><ins>+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
+
</ins><span class="cx"> # We need the webkit libraries to come before the system default libraries to prevent symbol conflicts with uuid.lib.
</span><span class="cx"> # To do this we add system default libs as webkit libs and zero out system default libs.
</span><span class="cx"> string(REPLACE " " "\;" CXX_LIBS ${CMAKE_CXX_STANDARD_LIBRARIES})
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (190420 => 190421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake 2015-10-01 18:26:42 UTC (rev 190420)
+++ trunk/Source/cmake/OptionsWin.cmake 2015-10-01 18:47:58 UTC (rev 190421)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> add_definitions(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE)
</span><del>-add_definitions(-D_WINDOWS -DWINVER=0x601 -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_HAS_EXCEPTIONS=0)
</del><ins>+add_definitions(-D_WINDOWS -DWINVER=0x601 -D_HAS_EXCEPTIONS=0)
</ins><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
</span><span class="lines">@@ -136,13 +136,17 @@
</span><span class="cx">
</span><span class="cx"> if (MSVC)
</span><span class="cx"> add_definitions(
</span><del>- /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
- /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4459 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610
- /wd4702 /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387 /wd4456 /wd4458
</del><ins>+ /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189
+ /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288 /wd4291 /wd4305 /wd4309
+ /wd4344 /wd4355 /wd4389 /wd4396 /wd4456 /wd4457 /wd4458 /wd4459 /wd4481
+ /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4611 /wd4702 /wd4706
+ /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246
+ /wd6255 /wd6387
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Create pdb files for debugging purposes, also for Release builds
</span><del>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi")
</del><ins>+ add_compile_options(/Zi /GS)
+
</ins><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
</span><span class="cx">
</span><span class="lines">@@ -152,14 +156,22 @@
</span><span class="cx"> # Warnings are important
</span><span class="cx"> add_compile_options(/W4)
</span><span class="cx">
</span><ins>+ # We have some very large object files that have to be linked
+ add_compile_options(/analyze- /bigobj /Bv)
+
+ # Use CRT security features
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1)
+
</ins><span class="cx"> # Turn off certain link features
</span><del>- add_compile_options(/Gy- /GR- /openmp- /GF- /MP)
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /INCREMENTAL:NO /LTCG:STATUS")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO /LTCG:STATUS")
</del><ins>+ add_compile_options(/Gy- /GR- /openmp- /GF-)
</ins><span class="cx">
</span><span class="cx"> if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:NOREF /OPT:NOICF")
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:NOREF /OPT:NOICF")
</span><ins>+
+ # To debug linking time issues, uncomment the following two lines:
+ #set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /VERBOSE /VERBOSE:INCR /TIME")
+ #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /VERBOSE /VERBOSE:INCR /TIME")
</ins><span class="cx"> elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
</span><span class="cx"> add_compile_options(/Oy-)
</span><span class="cx"> endif ()
</span></span></pre>
</div>
</div>
</body>
</html>