<!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>[171942] 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/171942">171942</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-08-01 12:19:14 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards cmake on Windows.
https://bugs.webkit.org/show_bug.cgi?id=135484
Reviewed by Martin Robinson.
.:
* CMakeLists.txt:
Added Mac to list of ports, even though it is not done yet.
Changed minimum bison version to version installed on Macs.
* Source/cmake/OptionsAppleWin.cmake:
Added some definitions.
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
Set WTF_LIBRARY_TYPE to STATIC to not change WTF linking on EFL or GTK ports.
* Source/cmake/OptionsMac.cmake: Added blank for now.
* Source/cmake/OptionsWinCairo.cmake:
* Source/cmake/OptionsWindows.cmake:
Added some definitions.
Removed /WX (warnings treated as error while compiling).
Copied warnings to ignore from WebKitLibraries/win/tools/vsprops/common.props.
Source/JavaScriptCore:
* CMakeLists.txt:
Generate code directly to inspector directory to avoid using the cp command
which is not available on Windows.
* PlatformWin.cmake: Added.
Source/WTF:
* wtf/CMakeLists.txt:
Added WTF_LIBRARY_TYPE because Windows needs WTF to be a shared library.</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="#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="#trunkSourcecmakeOptionsAppleWincmake">trunk/Source/cmake/OptionsAppleWin.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWinCairocmake">trunk/Source/cmake/OptionsWinCairo.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorePlatformWincmake">trunk/Source/JavaScriptCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/CMakeLists.txt 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Determine which port will be built
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-set(ALL_PORTS Efl WinCE GTK AppleWin WinCairo)
</del><ins>+set(ALL_PORTS Efl WinCE GTK AppleWin WinCairo Mac)
</ins><span class="cx"> set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
</span><span class="cx">
</span><span class="cx"> list(FIND ALL_PORTS ${PORT} RET)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Find common packages (used by all ports)
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-find_package(BISON 2.4.1 REQUIRED)
</del><ins>+find_package(BISON 2.3 REQUIRED)
</ins><span class="cx"> find_package(FLEX 2.5.34 REQUIRED)
</span><span class="cx">
</span><span class="cx"> # TODO Enforce version requirement for gperf
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/ChangeLog 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards cmake on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135484
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt:
+ Added Mac to list of ports, even though it is not done yet.
+ Changed minimum bison version to version installed on Macs.
+ * Source/cmake/OptionsAppleWin.cmake:
+ Added some definitions.
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ Set WTF_LIBRARY_TYPE to STATIC to not change WTF linking on EFL or GTK ports.
+ * Source/cmake/OptionsMac.cmake: Added blank for now.
+ * Source/cmake/OptionsWinCairo.cmake:
+ * Source/cmake/OptionsWindows.cmake:
+ Added some definitions.
+ Removed /WX (warnings treated as error while compiling).
+ Copied warnings to ignore from WebKitLibraries/win/tools/vsprops/common.props.
+
</ins><span class="cx"> 2014-08-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] GTK and EFL are using PROJECT_VERSION_PATCH to define the micro version
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/yarr"
</span><span class="cx"> "${WTF_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</span><ins>+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
</ins><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span><span class="cx"> ${ICU_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="lines">@@ -872,18 +873,19 @@
</span><span class="cx">
</span><span class="cx"> # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
</del><ins>+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
</ins><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
</span><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
</span><span class="cx"> DEPENDS ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py
</span><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type JavaScript --write_always && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type JavaScript --write_always
</ins><span class="cx"> VERBATIM)
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</ins><span class="cx">
</span><span class="cx"> # JSCBuiltins
</span><span class="cx"> file(GLOB JSCBuiltins_js_files "${CMAKE_CURRENT_SOURCE_DIR}/builtins/*.js")
</span><span class="lines">@@ -895,16 +897,16 @@
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
</del><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
</ins><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_HEADERS
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
</del><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
</ins><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards cmake on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135484
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt:
+ Generate code directly to inspector directory to avoid using the cp command
+ which is not available on Windows.
+ * PlatformWin.cmake: Added.
+
</ins><span class="cx"> 2014-07-31 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the JSC::OverridesVisitChildren flag.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformWincmake"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/PlatformWin.cmake (0 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformWin.cmake (rev 0)
+++ trunk/Source/JavaScriptCore/PlatformWin.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+list(APPEND JavaScriptCore_SOURCES
+ API/JSStringRefBSTR.cpp
+ API/JSStringRefCF.cpp
+)
+
+if (WTF_PLATFORM_WIN_CAIRO)
+ list(APPEND JavaScriptCore_LIBRARIES
+ CFLite
+ )
+else ()
+ list(APPEND JavaScriptCore_LIBRARIES
+ CoreFoundation
+ )
+endif ()
+
+if (MSVC AND "${JavaScriptCore_LIBRARY_TYPE}" MATCHES "SHARED")
+ get_property(WTF_LIBRARY_LOCATION TARGET WTF PROPERTY LOCATION)
+
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp
+ DEPENDS WTF
+ COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/Scripts/generate-win32-export-forwards ${WTF_LIBRARY_LOCATION} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp
+ VERBATIM)
+ list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp)
+endif ()
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/WTF/ChangeLog 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-31 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards cmake on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135484
+
+ Reviewed by Martin Robinson.
+
+ * wtf/CMakeLists.txt:
+ Added WTF_LIBRARY_TYPE because Windows needs WTF to be a shared library.
+
</ins><span class="cx"> 2014-07-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> PropertyName's internal string is always atomic.
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
</span><span class="cx"> include_directories(${WTF_INCLUDE_DIRECTORIES})
</span><del>-add_library(WTF STATIC ${WTF_HEADERS} ${WTF_SOURCES})
</del><ins>+add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
</ins><span class="cx"> target_link_libraries(WTF ${WTF_LIBRARIES})
</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></pre></div>
<a id="trunkSourcecmakeOptionsAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsAppleWin.cmake (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsAppleWin.cmake 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/cmake/OptionsAppleWin.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -1,3 +1,6 @@
</span><span class="cx"> include(OptionsWindows)
</span><span class="cx">
</span><del>-set(PORT_FALLBACK Win)
</del><ins>+set(WTF_USE_CG 1)
+set(WTF_USE_CA 1)
+set(WTF_USE_CFNETWORK 1)
+set(WTF_USE_ICU_UNICODE 1)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> add_definitions(-DWTF_USE_CAIRO=1)
</span><span class="cx"> add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
</span><span class="cx">
</span><ins>+set(WTF_LIBRARY_TYPE STATIC)
</ins><span class="cx"> set(WTF_OUTPUT_NAME wtf_efl)
</span><span class="cx"> set(JavaScriptCore_OUTPUT_NAME javascriptcore_efl)
</span><span class="cx"> set(WebCore_OUTPUT_NAME webcore_efl)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -174,6 +174,7 @@
</span><span class="cx"> set(WTF_USE_SOUP 1)
</span><span class="cx"> set(WTF_USE_UDIS86 1)
</span><span class="cx">
</span><ins>+set(WTF_LIBRARY_TYPE STATIC)
</ins><span class="cx"> set(WTF_OUTPUT_NAME WTFGTK)
</span><span class="cx"> set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
</span><span class="cx"> set(WebCore_OUTPUT_NAME WebCoreGTK)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/OptionsMac.cmake (0 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake (rev 0)
+++ trunk/Source/cmake/OptionsMac.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWinCairo.cmake (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWinCairo.cmake 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -1,3 +1,6 @@
</span><span class="cx"> include(OptionsWindows)
</span><span class="cx">
</span><del>-set(PORT_FALLBACK Win)
</del><ins>+set(WTF_PLATFORM_WIN_CAIRO 1)
+set(WTF_USE_CF 1)
+set(WTF_USE_CURL 1)
+set(WTF_USE_ICU_UNICODE 1)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (171941 => 171942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2014-08-01 19:08:59 UTC (rev 171941)
+++ trunk/Source/cmake/OptionsWindows.cmake 2014-08-01 19:19:14 UTC (rev 171942)
</span><span class="lines">@@ -4,10 +4,14 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC ON)
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><ins>+include_directories("$ENV{WEBKIT_LIBRARIES}/include")
+link_directories("$ENV{WEBKIT_LIBRARIES}/lib$(PlatformArchitecture)")
</ins><span class="cx"> if (MSVC)
</span><del>- add_definitions(/WX
- /wd4018 /wd4065 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4275 /wd4288 /wd4291
- /wd4305 /wd4344 /wd4355 /wd4389 /wd4396 /wd4503 /wd4505 /wd4510 /wd4512 /wd4610 /wd4706 /wd4800 /wd4951 /wd4952 /wd4996)
</del><ins>+ add_definitions(
+ /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
+ /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
+ /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
+ )
</ins><span class="cx">
</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="lines">@@ -17,3 +21,8 @@
</span><span class="cx"> set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}")
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><ins>+
+set(PORT_FALLBACK Win)
+set(JavaScriptCore_LIBRARY_TYPE SHARED)
+set(WTF_LIBRARY_TYPE SHARED)
+set(ICU_LIBRARIES libicuuc$(DebugSuffix) libicuin$(DebugSuffix))
</ins></span></pre>
</div>
</div>
</body>
</html>