<!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>[187585] 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/187585">187585</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-30 09:16:23 -0700 (Thu, 30 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build AppleWin port with CMake
https://bugs.webkit.org/show_bug.cgi?id=147385
Reviewed by Martin Robinson.
.:
* Source/cmake/OptionsWindows.cmake:
Use the static multithreaded runtime. Based on
http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
Source/WebCore:
* CMakeLists.txt:
Add makesafeseh.asm to 32-bit build. It needs to be after the ADD_PRECOMPILED_HEADER macro
because CMake can only set COMPILE_FLAGS once with set_source_files_properties, and we want
to use that to add /safeseh instead of a precompiled header (which wouldn't be used anyway in assembly).
* PlatformAppleWin.cmake:
* PlatformWin.cmake:
* PlatformWinCairo.cmake:
Added missing source files and libraries.
Source/WebKit:
* PlatformWin.cmake:
Added missing source files and libraries.
Tools:
* WinLauncher/CMakeLists.txt:
Link to CoreFoundation.lib and added /NODEFAULTLIB:LIBCMT to get it to link successfully.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</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="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</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="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/ChangeLog 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-30 Alex Christensen <achristensen@webkit.org>
+
+ Build AppleWin port with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147385
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/OptionsWindows.cmake:
+ Use the static multithreaded runtime. Based on
+ http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
+
</ins><span class="cx"> 2015-07-29 Andy VanWagoner <thetalecrafter@gmail.com>
</span><span class="cx">
</span><span class="cx"> Implement basic types for ECMAScript Internationalization API
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -3576,6 +3576,10 @@
</span><span class="cx">
</span><span class="cx"> if (MSVC)
</span><span class="cx"> ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
</span><ins>+ if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ list(APPEND WebCore_SOURCES platform/win/makesafeseh.asm)
+ set_source_files_properties(platform/win/makesafeseh.asm PROPERTIES COMPILE_FLAGS "/safeseh")
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebCore/ChangeLog 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-07-30 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Build AppleWin port with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147385
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt:
+ Add makesafeseh.asm to 32-bit build. It needs to be after the ADD_PRECOMPILED_HEADER macro
+ because CMake can only set COMPILE_FLAGS once with set_source_files_properties, and we want
+ to use that to add /safeseh instead of a precompiled header (which wouldn't be used anyway in assembly).
+ * PlatformAppleWin.cmake:
+ * PlatformWin.cmake:
+ * PlatformWinCairo.cmake:
+ Added missing source files and libraries.
+
+2015-07-30 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> [Win] Unreviewed build fix after r187582.
</span><span class="cx">
</span><span class="cx"> * accessibility/AccessibilityAllInOne.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformAppleWin.cmake 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -13,6 +13,11 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> editing/SmartReplaceCF.cpp
</span><span class="cx">
</span><ins>+ loader/cf/ResourceLoaderCFNet.cpp
+
+ page/win/FrameCGWin.cpp
+
+ platform/cf/CFURLExtras.cpp
</ins><span class="cx"> platform/cf/URLCF.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/ca/GraphicsLayerCA.cpp
</span><span class="lines">@@ -71,12 +76,16 @@
</span><span class="cx"> platform/network/cf/FormDataStreamCFNet.cpp
</span><span class="cx"> platform/network/cf/LoaderRunLoopCF.cpp
</span><span class="cx"> platform/network/cf/NetworkStorageSessionCFNet.cpp
</span><ins>+ platform/network/cf/ProtectionSpaceCFNet.cpp
</ins><span class="cx"> platform/network/cf/ProxyServerCFNet.cpp
</span><span class="cx"> platform/network/cf/ResourceErrorCF.cpp
</span><span class="cx"> platform/network/cf/ResourceHandleCFNet.cpp
</span><ins>+ platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
</ins><span class="cx"> platform/network/cf/ResourceRequestCFNet.cpp
</span><span class="cx"> platform/network/cf/ResourceResponseCFNet.cpp
</span><span class="cx"> platform/network/cf/SocketStreamHandleCFNet.cpp
</span><ins>+ platform/network/cf/SynchronousLoaderClientCFNet.cpp
+ platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
</ins><span class="cx">
</span><span class="cx"> platform/win/DragImageCGWin.cpp
</span><span class="cx"> )
</span><span class="lines">@@ -92,3 +101,30 @@
</span><span class="cx"> platform/spi/cf
</span><span class="cx"> platform/spi/cg
</span><span class="cx"> )
</span><ins>+
+list(APPEND WebCore_LIBRARIES
+ ASL
+ AVFoundationCF
+ CFNetwork
+ CoreAudioToolbox
+ CoreFoundation
+ CoreGraphics
+ CoreMedia
+ CoreText
+ CoreVideo
+ MediaAccessibility
+ MediaToolbox
+ QuartzCore
+ SQLite3
+ SafariTheme
+ WebKitQuartzCoreAdditions
+ icuin
+ icuuc
+ libdispatch
+ libexslt
+ libicuin
+ libicuuc
+ libxml2
+ libxslt
+ zdll
+)
</ins></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -10,13 +10,18 @@
</span><span class="cx"> "${WEBCORE_DIR}/plugins/win"
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+enable_language(ASM_MASM)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><ins>+ accessibility/win/AXObjectCacheWin.cpp
</ins><span class="cx"> accessibility/win/AccessibilityObjectWin.cpp
</span><ins>+ accessibility/win/AccessibilityObjectWrapperWin.cpp
</ins><span class="cx">
</span><span class="cx"> editing/win/EditorWin.cpp
</span><span class="cx">
</span><span class="cx"> html/HTMLSelectElementWin.cpp
</span><span class="cx">
</span><ins>+ loader/archive/cf/LegacyWebArchive.cpp
+
</ins><span class="cx"> page/win/DragControllerWin.cpp
</span><span class="cx"> page/win/EventHandlerWin.cpp
</span><span class="cx"> page/win/FrameWin.cpp
</span><span class="lines">@@ -28,9 +33,19 @@
</span><span class="cx">
</span><span class="cx"> platform/audio/PlatformMediaSessionManager.cpp
</span><span class="cx">
</span><ins>+ platform/cf/FileSystemCF.cpp
+ platform/cf/SharedBufferCF.cpp
+
+ platform/cf/win/CertificateCFWin.cpp
+
+ platform/graphics/FontPlatformData.cpp
+ platform/graphics/WOFFFileFormat.cpp
+
</ins><span class="cx"> platform/graphics/opentype/OpenTypeUtilities.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><ins>+ platform/graphics/win/FontCacheWin.cpp
+ platform/graphics/win/FontPlatformDataWin.cpp
</ins><span class="cx"> platform/graphics/win/FontWin.cpp
</span><span class="cx"> platform/graphics/win/GraphicsContextWin.cpp
</span><span class="cx"> platform/graphics/win/IconWin.cpp
</span><span class="lines">@@ -39,9 +54,16 @@
</span><span class="cx"> platform/graphics/win/IntRectWin.cpp
</span><span class="cx"> platform/graphics/win/IntSizeWin.cpp
</span><span class="cx"> platform/graphics/win/SimpleFontDataWin.cpp
</span><ins>+ platform/graphics/win/TransformationMatrixWin.cpp
+ platform/graphics/win/UniscribeController.cpp
</ins><span class="cx">
</span><ins>+ platform/network/win/DownloadBundleWin.cpp
</ins><span class="cx"> platform/network/win/NetworkStateNotifierWin.cpp
</span><span class="cx">
</span><ins>+ platform/text/LocaleNone.cpp
+
+ platform/text/win/TextBreakIteratorInternalICUWin.cpp
+
</ins><span class="cx"> platform/win/BString.cpp
</span><span class="cx"> platform/win/BitmapInfo.cpp
</span><span class="cx"> platform/win/ClipboardUtilitiesWin.cpp
</span><span class="lines">@@ -61,6 +83,7 @@
</span><span class="cx"> platform/win/MemoryPressureHandlerWin.cpp
</span><span class="cx"> platform/win/MIMETypeRegistryWin.cpp
</span><span class="cx"> platform/win/PasteboardWin.cpp
</span><ins>+ platform/win/PathWalker.cpp
</ins><span class="cx"> platform/win/PlatformMouseEventWin.cpp
</span><span class="cx"> platform/win/PlatformScreenWin.cpp
</span><span class="cx"> platform/win/PopupMenuWin.cpp
</span><span class="lines">@@ -70,13 +93,24 @@
</span><span class="cx"> platform/win/SharedBufferWin.cpp
</span><span class="cx"> platform/win/SharedTimerWin.cpp
</span><span class="cx"> platform/win/SoundWin.cpp
</span><ins>+ platform/win/StructuredExceptionHandlerSuppressor.cpp
</ins><span class="cx"> platform/win/SystemInfo.cpp
</span><span class="cx"> platform/win/WCDataObject.cpp
</span><ins>+ platform/win/WebCoreBundleWin.cpp
</ins><span class="cx"> platform/win/WebCoreInstanceHandle.cpp
</span><ins>+ platform/win/WebCoreTextRenderer.cpp
</ins><span class="cx"> platform/win/WheelEventWin.cpp
</span><span class="cx"> platform/win/WidgetWin.cpp
</span><ins>+ platform/win/WindowMessageBroadcaster.cpp
+
+ rendering/RenderThemeWin.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
+ ${WEBCORE_DIR}/css/themeWin.css
+ ${WEBCORE_DIR}/css/themeWinQuirks.css
+)
+
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">
</span><span class="cx"> platform/cf/win/CertificateCFWin.cpp
</span><span class="cx">
</span><del>- platform/graphics/FontPlatformData.cpp
</del><span class="cx"> platform/graphics/GLContext.cpp
</span><span class="cx"> platform/graphics/GraphicsLayer.cpp
</span><span class="cx"> platform/graphics/ImageSource.cpp
</span><span class="lines">@@ -76,7 +75,6 @@
</span><span class="cx"> platform/graphics/win/FontCacheWin.cpp
</span><span class="cx"> platform/graphics/win/FontCustomPlatformDataCairo.cpp
</span><span class="cx"> platform/graphics/win/FontPlatformDataCairoWin.cpp
</span><del>- platform/graphics/win/FontPlatformDataWin.cpp
</del><span class="cx"> platform/graphics/win/FontWin.cpp
</span><span class="cx"> platform/graphics/win/FullScreenController.cpp
</span><span class="cx"> platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp
</span><span class="lines">@@ -150,11 +148,6 @@
</span><span class="cx"> rendering/RenderThemeWin.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
- ${WEBCORE_DIR}/css/themeWin.css
- ${WEBCORE_DIR}/css/themeWinQuirks.css
-)
-
</del><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${DirectX_LIBRARIES}
</span><span class="cx"> CFLite
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebKit/ChangeLog 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-30 Alex Christensen <achristensen@webkit.org>
+
+ Build AppleWin port with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147385
+
+ Reviewed by Martin Robinson.
+
+ * PlatformWin.cmake:
+ Added missing source files and libraries.
+
</ins><span class="cx"> 2015-07-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use Ninja on Windows.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -14,6 +14,14 @@
</span><span class="cx"> libeay32.lib
</span><span class="cx"> ssleay32.lib
</span><span class="cx"> )
</span><ins>+else ()
+ list(APPEND WebKit_SOURCES_Classes
+ win/WebDownloadCFNet.cpp
+ win/WebURLAuthenticationChallengeSenderCFNet.cpp
+ )
+ list(APPEND WebKit_LIBRARIES
+ WebKitSystemInterface
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -396,8 +404,15 @@
</span><span class="cx"> set_target_properties(WebKitGUID PROPERTIES FOLDER "WebKit")
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><ins>+ Comctl32
+ Comsupp
+ Crypt32
+ Iphlpapi
+ Rpcrt4
+ Shlwapi
+ Usp10
+ Version
</ins><span class="cx"> WebKitGUID
</span><del>- comsupp.lib
</del><span class="cx"> )
</span><span class="cx">
</span><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="lines">@@ -406,7 +421,7 @@
</span><span class="cx"> list(APPEND WebKit_LIBRARIES ${CXX_LIBS})
</span><span class="cx"> set(CMAKE_CXX_STANDARD_LIBRARIES "")
</span><span class="cx">
</span><del>-set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "/NODEFAULTLIB:LIBCMT")
</del><ins>+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
</ins><span class="cx">
</span><span class="cx"> # If this directory isn't created before midl runs and attempts to output WebKit.tlb,
</span><span class="cx"> # It fails with an unusual error - midl failed - failed to save all changes
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -31,6 +31,15 @@
</span><span class="cx"> string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
</span><span class="cx"> string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
</span><span class="cx"> endif ()
</span><ins>+
+ # Use the multithreaded static runtime library instead of the default DLL runtime.
+ foreach (flag_var
+ CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+ CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+ if (${flag_var} MATCHES "/MD")
+ string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+ endif ()
+ endforeach ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(PORT Win)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Tools/ChangeLog 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-30 Alex Christensen <achristensen@webkit.org>
+
+ Build AppleWin port with CMake
+ https://bugs.webkit.org/show_bug.cgi?id=147385
+
+ Reviewed by Martin Robinson.
+
+ * WinLauncher/CMakeLists.txt:
+ Link to CoreFoundation.lib and added /NODEFAULTLIB:LIBCMT to get it to link successfully.
+
</ins><span class="cx"> 2015-07-29 Andy VanWagoner <thetalecrafter@gmail.com>
</span><span class="cx">
</span><span class="cx"> Implement basic types for ECMAScript Internationalization API
</span></span></pre></div>
<a id="trunkToolsWinLauncherCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/CMakeLists.txt (187584 => 187585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-07-30 15:56:35 UTC (rev 187584)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-07-30 16:16:23 UTC (rev 187585)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WinLauncher_LIBRARIES
</span><del>- CFLite
</del><span class="cx"> DbgHelp
</span><span class="cx"> WTF
</span><span class="cx"> WebKit
</span><span class="lines">@@ -36,6 +35,17 @@
</span><span class="cx"> shlwapi
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (WTF_PLATFORM_WIN_CAIRO)
+ list(APPEND WinLauncher_LIBRARIES
+ CFLite
+ )
+else ()
+ list(APPEND WinLauncher_LIBRARIES
+ CoreFoundation
+ )
+endif ()
+
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
</ins><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
</span><span class="cx">
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span></span></pre>
</div>
</div>
</body>
</html>