<!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>[183416] 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/183416">183416</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-27 13:30:15 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Autogenerate cmakeconfig.h.cmake
https://bugs.webkit.org/show_bug.cgi?id=143997
Reviewed by Csaba Osztrogonác.
.:
* CMakeLists.txt: Create the configuration header as the last part of the cmake run.
* Source/CMakeLists.txt: No longer use configure_file to create cmakeconfig.h.
* Source/cmake/OptionsCommon.cmake: Expose WTF_CPU_ARM64_CORTEXA53 to the build explicitly.
* Source/cmake/OptionsGTK.cmake: Expose variables to the build using SET_AND_EXPOSE_TO_BUILD.
Do some other miscellaneous related cleanup.
* Source/cmake/OptionsEFL.cmake: Expose HAVE_LLVM to the build.
* Source/cmake/WebKitFeatures.cmake: Expose all WebKit features to the build. Add support for
build exposed variables. Add a macro to generate a configuration from them.
* Source/cmakeconfig.h.cmake: Removed.
Source/WebCore:
* PlatformGTK.cmake: Use the WTF_USE style variables, because those are the same
as the ones exposed to the build.
Source/WTF:
* wtf/Platform.h: Move a GTK-specific setting from cmakeconfig.h to here.
Tools:
* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Add XP_UNIX to the command-line
definitions since TestNetscapePlugIn does not use cmakeconfig.h.</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="#trunkSourceCMakeListstxt">trunk/Source/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsCommoncmake">trunk/Source/cmake/OptionsCommon.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="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInCMakeListstxt">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/CMakeLists.txt 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -183,3 +183,8 @@
</span><span class="cx"> # Print the features list last, for maximum visibility.
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> PRINT_WEBKIT_OPTIONS()
</span><ins>+
+# -----------------------------------------------------------------------------
+# Create the configuration header
+# -----------------------------------------------------------------------------
+CREATE_CONFIGURATION_HEADER()
</ins></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/ChangeLog 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-22 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] Autogenerate cmakeconfig.h.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=143997
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt: Create the configuration header as the last part of the cmake run.
+ * Source/CMakeLists.txt: No longer use configure_file to create cmakeconfig.h.
+ * Source/cmake/OptionsCommon.cmake: Expose WTF_CPU_ARM64_CORTEXA53 to the build explicitly.
+ * Source/cmake/OptionsGTK.cmake: Expose variables to the build using SET_AND_EXPOSE_TO_BUILD.
+ Do some other miscellaneous related cleanup.
+ * Source/cmake/OptionsEFL.cmake: Expose HAVE_LLVM to the build.
+ * Source/cmake/WebKitFeatures.cmake: Expose all WebKit features to the build. Add support for
+ build exposed variables. Add a macro to generate a configuration from them.
+ * Source/cmakeconfig.h.cmake: Removed.
+
</ins><span class="cx"> 2015-04-24 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JHBuild] Move to upstream OpenWebRTC
</span></span></pre></div>
<a id="trunkSourceCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/CMakeLists.txt (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/CMakeLists.txt 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/CMakeLists.txt 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -42,8 +42,3 @@
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span><span class="cx"> WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_COMPILER_FLAGS})
</span><span class="cx"> endif ()
</span><del>-
-# -----------------------------------------------------------------------------
-# Create the configuration file
-# -----------------------------------------------------------------------------
-configure_file(cmakeconfig.h.cmake ${CMAKE_BINARY_DIR}/cmakeconfig.h @ONLY)
</del></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/WTF/ChangeLog 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-04-22 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] Autogenerate cmakeconfig.h.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=143997
+
+ Reviewed by Csaba Osztrogonác.
+
+ * wtf/Platform.h: Move a GTK-specific setting from cmakeconfig.h to here.
+
</ins><span class="cx"> 2015-04-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Rename ENABLE_3D_RENDERING to ENABLE_3D_TRANSFORMS
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/WTF/wtf/Platform.h 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -488,6 +488,10 @@
</span><span class="cx"> #define WTF_USE_WEBP 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)
+#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6
+#endif
+
</ins><span class="cx"> /* On Windows, use QueryPerformanceCounter by default */
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> #define WTF_USE_QUERY_PERFORMANCE_COUNTER 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/WebCore/ChangeLog 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-22 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] Autogenerate cmakeconfig.h.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=143997
+
+ Reviewed by Csaba Osztrogonác.
+
+ * PlatformGTK.cmake: Use the WTF_USE style variables, because those are the same
+ as the ones exposed to the build.
+
</ins><span class="cx"> 2015-04-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Wrong text offsetting when range does not start from the first renderer.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> ${GSTREAMER_VIDEO_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><del>- if (USE_GSTREAMER_MPEGTS)
</del><ins>+ if (WTF_USE_GSTREAMER_MPEGTS)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GSTREAMER_MPEGTS_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>- if (USE_GSTREAMER_GL)
</del><ins>+ if (WTF_USE_GSTREAMER_GL)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GSTREAMER_GL_INCLUDE_DIRS}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsCommon.cmake (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsCommon.cmake 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/cmake/OptionsCommon.cmake 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53)
+
</ins><span class="cx"> # Use ld.gold if it is available and isn't disabled explicitly
</span><span class="cx"> option(USE_LD_GOLD "Use GNU gold linker" ON)
</span><span class="cx"> if (USE_LD_GOLD)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> else ()
</span><span class="cx"> message(FATAL_ERROR "FTL JIT is only available on X86_64 and AArch64 architectures.")
</span><span class="cx"> endif ()
</span><del>- set(HAVE_LLVM ON)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
</ins><span class="cx"> if (ENABLE_FTL_NATIVE_CALL_INLINING)
</span><span class="cx"> find_package(Clang REQUIRED)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -135,6 +135,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC OFF)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+# FIXME: There is no reason these should be different.
+SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
</ins><span class="cx"> if (DEVELOPER_MODE)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PUBLIC ON)
</span><span class="lines">@@ -198,6 +200,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS PRIVATE OFF)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PUBLIC ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
</span><span class="lines">@@ -210,34 +213,20 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THREADED_COMPOSITOR PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><del>-if (LIBNOTIFY_FOUND)
- add_definitions(-DWTF_USE_LIBNOTIFY=1)
-else ()
- add_definitions(-DWTF_USE_LIBNOTIFY=0)
-endif ()
-
</del><span class="cx"> if (ENABLE_PLUGIN_PROCESS_GTK2)
</span><span class="cx"> find_package(GTK2 2.24.10 REQUIRED)
</span><span class="cx"> find_package(GDK2 2.24.10 REQUIRED)
</span><del>- add_definitions(-DENABLE_PLUGIN_PROCESS_GTK2=1)
</del><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_X11_TARGET)
- add_definitions(-DWTF_PLATFORM_X11=1)
- add_definitions(-DMOZ_X11=1)
- if (WTF_OS_UNIX)
- add_definitions(-DXP_UNIX)
- endif ()
-endif ()
</del><ins>+SET_AND_EXPOSE_TO_BUILD(WTF_USE_LIBNOTIFY ${LIBNOTIFY_FOUND})
+SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_X11 ${ENABLE_X11_TARGET})
+SET_AND_EXPOSE_TO_BUILD(MOZ_X11 ${ENABLE_X11_TARGET})
+SET_AND_EXPOSE_TO_BUILD(XP_UNIX ${WTF_OS_UNIX})
+SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_WAYLAND ${ENABLE_WAYLAND_TARGET})
</ins><span class="cx">
</span><del>-if (ENABLE_WAYLAND_TARGET)
- add_definitions(-DWTF_PLATFORM_WAYLAND=1)
-endif ()
-
</del><span class="cx"> set(ENABLE_WEBKIT OFF)
</span><span class="cx"> set(ENABLE_WEBKIT2 ON)
</span><span class="cx"> set(ENABLE_PLUGIN_PROCESS ON)
</span><del>-set(ENABLE_SMOOTH_SCROLLING ON)
</del><span class="cx">
</span><span class="cx"> set(GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6)
</span><span class="cx"> set(GTK_API_VERSION 3.0)
</span><span class="lines">@@ -263,27 +252,22 @@
</span><span class="cx"> add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
</span><span class="cx"> add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
</span><span class="cx">
</span><del>-if (DEVELOPER_MODE)
- add_definitions(-DDEVELOPMENT_BUILD=1)
-endif ()
-
</del><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span><span class="cx"> set(GSTREAMER_COMPONENTS app pbutils)
</span><del>- add_definitions(-DWTF_USE_GSTREAMER)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER TRUE)
</ins><span class="cx"> if (ENABLE_VIDEO)
</span><span class="cx"> list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEB_AUDIO)
</span><span class="cx"> list(APPEND GSTREAMER_COMPONENTS audio fft)
</span><del>- add_definitions(-DWTF_USE_WEBAUDIO_GSTREAMER)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_WEBAUDIO_GSTREAMER TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
</span><span class="cx">
</span><span class="cx"> if (PC_GSTREAMER_MPEGTS_FOUND)
</span><del>- add_definitions(-DWTF_USE_GSTREAMER_MPEGTS)
- set(USE_GSTREAMER_MPEGTS TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER_MPEGTS TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -307,32 +291,22 @@
</span><span class="cx"> find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components})
</span><span class="cx">
</span><span class="cx"> if (ENABLE_GEOLOCATION)
</span><del>- if (GEOCLUE2_FOUND)
- set(WTF_USE_GEOCLUE2 1)
- else ()
- set(WTF_USE_GEOCLUE2 0)
- endif ()
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_GEOCLUE2 ${GEOCLUE2_FOUND})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_MEDIA_STREAM)
</span><span class="cx"> find_package(OpenWebRTC)
</span><del>- if (OPENWEBRTC_FOUND)
- add_definitions(-DWTF_USE_OPENWEBRTC)
- endif ()
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENWEBRTC ${OPENWEBRTC_FOUND})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> find_package(GTKUnixPrint)
</span><del>-if (GTK_UNIX_PRINT_FOUND)
- set(HAVE_GTK_UNIX_PRINTING 1)
-endif ()
</del><ins>+SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK_UNIX_PRINT_FOUND})
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_CREDENTIAL_STORAGE)
</span><span class="cx"> find_package(Libsecret REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (GTK_SUPPORTS_GESTURES)
- add_definitions(-DHAVE_GTK_GESTURES=1)
-endif ()
</del><ins>+SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_GESTURES ${GTK_SUPPORTS_GESTURES})
</ins><span class="cx">
</span><span class="cx"> # This part can be simplified once CMake 2.8.6 is required and
</span><span class="cx"> # CMakePushCheckState can be used. We need to have OPENGL_INCLUDE_DIR as part
</span><span class="lines">@@ -342,59 +316,38 @@
</span><span class="cx"> set(REQUIRED_INCLUDES_OLD ${CMAKE_REQUIRED_INCLUDES})
</span><span class="cx"> set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
</span><span class="cx"> set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
</span><del>-
- if (GLX_FOUND)
- set(WTF_USE_GLX 1)
- endif ()
</del><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (EGL_FOUND)
- set(WTF_USE_EGL 1)
-endif ()
-
</del><span class="cx"> if (ENABLE_SPELLCHECK)
</span><span class="cx"> find_package(Enchant REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
</span><span class="cx"> set(ENABLE_TEXTURE_MAPPER 1)
</span><del>- set(WTF_USE_3D_GRAPHICS 1)
</del><span class="cx">
</span><del>- add_definitions(-DWTF_USE_3D_GRAPHICS=1)
- add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
- add_definitions(-DWTF_USE_TEXTURE_MAPPER_GL=1)
- add_definitions(-DENABLE_3D_RENDERING=1)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_3D_GRAPHICS TRUE)
+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER TRUE)
+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER_GL TRUE)
+ set(ENABLE_3D_RENDERING ON) # This is already exposed by WEBKIT_OPTION_DEFINE.
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_X11_TARGET AND USE_REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="cx"> add_definitions(-DWTF_USE_REDIRECTED_XCOMPOSITE_WINDOW=1)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (OPENGLES2_FOUND)
</span><del>- set(WTF_USE_OPENGL_ES_2 1)
- add_definitions(-DWTF_USE_OPENGL_ES_2=1)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENGL_ES_2 TRUE)
</ins><span class="cx"> else ()
</span><del>- set(WTF_USE_OPENGL 1)
- add_definitions(-DWTF_USE_OPENGL=1)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENGL TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><del>- if (EGL_FOUND)
- add_definitions(-DWTF_USE_EGL=1)
- endif ()
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_EGL ${EGL_FOUND})
+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_GLX ${GLX_FOUND})
</ins><span class="cx">
</span><del>- if (GLX_FOUND)
- add_definitions(-DWTF_USE_GLX=1)
- endif ()
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_TILED_BACKING_STORE ${ENABLE_THREADED_COMPOSITOR})
+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR})
+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR})
</ins><span class="cx">
</span><del>- if (ENABLE_THREADED_COMPOSITOR)
- add_definitions(-DWTF_USE_TILED_BACKING_STORE=1)
- add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
- add_definitions(-DWTF_USE_COORDINATED_GRAPHICS_THREADED=1)
- endif ()
-
- if (PC_GSTREAMER_GL_FOUND)
- add_definitions(-DWTF_USE_GSTREAMER_GL)
- set(USE_GSTREAMER_GL TRUE)
- endif ()
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER_GL ${PC_GSTREAMER_GL_FOUND})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_GAMEPAD_DEPRECATED)
</span><span class="lines">@@ -403,7 +356,7 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_FTL_JIT)
</span><span class="cx"> find_package(LLVM REQUIRED)
</span><del>- set(HAVE_LLVM ON)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(CPACK_SOURCE_GENERATOR TBZ2)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> set(_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name} ${_initial_value})
</span><span class="cx"> set(_WEBKIT_AVAILABLE_OPTIONS_${_name}_DEPENDENCIES "")
</span><span class="cx"> list(APPEND _WEBKIT_AVAILABLE_OPTIONS ${_name})
</span><ins>+ EXPOSE_VARIABLE_TO_BUILD(${_name})
</ins><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> macro(WEBKIT_OPTION_DEFAULT_PORT_VALUE _name _public _value)
</span><span class="lines">@@ -80,6 +81,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ICONDATABASE "Toggle Icon database support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_IMAGE_DECODER_DOWN_SAMPLING "Toggle image decoder down sampling support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INDEXED_DATABASE "Toggle Indexed Database API support" PRIVATE OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_INDEXED_DATABASE_IN_WORKERS "Toggle support for indexed database in workers" PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INDIE_UI "Toggle Indie UI support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR "Toggle Color Input support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INPUT_TYPE_COLOR_POPOVER "Toggle popover color input support" PRIVATE OFF)
</span><span class="lines">@@ -132,6 +134,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SATURATED_LAYOUT_ARITHMETIC "Toggle saturated layout arithmetic support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_STREAMS_API "Toggle Streams API support" PRIVATE ON)
</span><span class="lines">@@ -239,3 +242,44 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endforeach ()
</span><span class="cx"> endmacro()
</span><ins>+
+set(_WEBKIT_CONFIG_FILE_VARIABLES "")
+
+macro(EXPOSE_VARIABLE_TO_BUILD _variable_name)
+ list(APPEND _WEBKIT_CONFIG_FILE_VARIABLES ${_variable_name})
+endmacro()
+
+macro(SET_AND_EXPOSE_TO_BUILD _variable_name)
+ # It's important to handle the case where the value isn't passed, because often
+ # during configuration an empty variable is the result of a failed package search.
+ if (${ARGC} GREATER 1)
+ set(_variable_value ${ARGV1})
+ else ()
+ set(_variable_value OFF)
+ endif ()
+
+ set(${_variable_name} ${_variable_value})
+ EXPOSE_VARIABLE_TO_BUILD(${_variable_name})
+endmacro()
+
+macro(CREATE_CONFIGURATION_HEADER)
+ list(SORT _WEBKIT_CONFIG_FILE_VARIABLES)
+ set(_file_contents "#ifndef CMAKECONFIG_H\n")
+ set(_file_contents "${_file_contents}#define CMAKECONFIG_H\n\n")
+ foreach (_variable_name ${_WEBKIT_CONFIG_FILE_VARIABLES})
+ if (${${_variable_name}})
+ set(_file_contents "${_file_contents}#define ${_variable_name} 1\n")
+ else ()
+ set(_file_contents "${_file_contents}#define ${_variable_name} 0\n")
+ endif ()
+ endforeach ()
+ set(_file_contents "${_file_contents}\n#endif /* CMAKECONFIG_H */\n")
+
+ file(WRITE "${CMAKE_BINARY_DIR}/cmakeconfig.h.tmp" "${_file_contents}")
+ execute_process(COMMAND ${CMAKE_COMMAND}
+ -E copy_if_different
+ "${CMAKE_BINARY_DIR}/cmakeconfig.h.tmp"
+ "${CMAKE_BINARY_DIR}/cmakeconfig.h"
+ )
+ file(REMOVE "${CMAKE_BINARY_DIR}/cmakeconfig.h.tmp")
+endmacro()
</ins></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/cmakeconfig.h.cmake (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Source/cmakeconfig.h.cmake 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -1,151 +0,0 @@
</span><del>-#ifndef CMAKECONFIG_H
-#define CMAKECONFIG_H
-
-#cmakedefine01 ENABLE_3D_TRANSFORMS
-#cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
-#cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
-#cmakedefine01 ENABLE_ACCESSIBILITY
-#cmakedefine01 ENABLE_API_TESTS
-#cmakedefine01 ENABLE_ATTACHMENT_ELEMENT
-#cmakedefine01 ENABLE_AVF_CAPTIONS
-#cmakedefine01 ENABLE_ASSEMBLER_WX_EXCLUSIVE
-#cmakedefine01 ENABLE_BATTERY_STATUS
-#cmakedefine01 ENABLE_CACHE_PARTITIONING
-#cmakedefine01 ENABLE_CANVAS_PATH
-#cmakedefine01 ENABLE_CANVAS_PROXY
-#cmakedefine01 ENABLE_CHANNEL_MESSAGING
-#cmakedefine01 ENABLE_ES6_CLASS_SYNTAX
-#cmakedefine01 ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX
-#cmakedefine01 ENABLE_CONTENT_FILTERING
-#cmakedefine01 ENABLE_CONTEXT_MENUS
-#cmakedefine01 ENABLE_CREDENTIAL_STORAGE
-#cmakedefine01 ENABLE_CSP_NEXT
-#cmakedefine01 ENABLE_CSS3_TEXT
-#cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
-#cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
-#cmakedefine01 ENABLE_CSS_COMPOSITING
-#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
-#cmakedefine01 ENABLE_CSS_GRID_LAYOUT
-#cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
-#cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
-#cmakedefine01 ENABLE_CSS_IMAGE_SET
-#cmakedefine01 ENABLE_CSS_REGIONS
-#cmakedefine01 ENABLE_CSS_SCROLL_SNAP
-#cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
-#cmakedefine01 ENABLE_CSS_SHAPES
-#cmakedefine01 ENABLE_CURSOR_VISIBILITY
-#cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
-#cmakedefine01 ENABLE_DASHBOARD_SUPPORT
-#cmakedefine01 ENABLE_DATACUE_VALUE
-#cmakedefine01 ENABLE_DATALIST_ELEMENT
-#cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
-#cmakedefine01 ENABLE_DETAILS_ELEMENT
-#cmakedefine01 ENABLE_DEVICE_ORIENTATION
-#cmakedefine01 ENABLE_DFG_JIT
-#cmakedefine01 ENABLE_DOM4_EVENTS_CONSTRUCTOR
-#cmakedefine01 ENABLE_DOWNLOAD_ATTRIBUTE
-#cmakedefine01 ENABLE_DRAG_SUPPORT
-#cmakedefine01 ENABLE_ENCRYPTED_MEDIA
-#cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
-#cmakedefine01 ENABLE_FILTERS_LEVEL_2
-#cmakedefine01 ENABLE_FONT_LOAD_EVENTS
-#cmakedefine01 ENABLE_FTPDIR
-#cmakedefine01 ENABLE_FTL_JIT
-#cmakedefine01 ENABLE_FTL_NATIVE_CALL_INLINING
-#cmakedefine01 ENABLE_FULLSCREEN_API
-#cmakedefine01 ENABLE_GAMEPAD
-#cmakedefine01 ENABLE_GAMEPAD_DEPRECATED
-#cmakedefine01 ENABLE_GEOLOCATION
-#cmakedefine01 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING
-#cmakedefine01 ENABLE_ICONDATABASE
-#cmakedefine01 ENABLE_IMAGE_DECODER_DOWN_SAMPLING
-#cmakedefine01 ENABLE_INDEXED_DATABASE
-#cmakedefine01 ENABLE_INDEXED_DATABASE_IN_WORKERS
-#cmakedefine01 ENABLE_INDIE_UI
-#cmakedefine01 ENABLE_INPUT_TYPE_COLOR
-#cmakedefine01 ENABLE_INPUT_TYPE_COLOR_POPOVER
-#cmakedefine01 ENABLE_INPUT_TYPE_DATE
-#cmakedefine01 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
-#cmakedefine01 ENABLE_INPUT_TYPE_DATETIMELOCAL
-#cmakedefine01 ENABLE_INPUT_TYPE_TIME
-#cmakedefine01 ENABLE_INPUT_TYPE_MONTH
-#cmakedefine01 ENABLE_INPUT_TYPE_WEEK
-#cmakedefine01 ENABLE_IOS_AIRPLAY
-#cmakedefine01 ENABLE_IOS_TEXT_AUTOSIZING
-#cmakedefine01 ENABLE_JIT
-#cmakedefine01 ENABLE_LEGACY_CSS_VENDOR_PREFIXES
-#cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
-#cmakedefine01 ENABLE_LEGACY_VENDOR_PREFIXES
-#cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
-#cmakedefine01 ENABLE_LINK_PREFETCH
-#cmakedefine01 ENABLE_MAC_LONG_PRESS
-#cmakedefine01 ENABLE_MATHML
-#cmakedefine01 ENABLE_MEDIA_CAPTURE
-#cmakedefine01 ENABLE_MEDIA_CONTROLS_SCRIPT
-#cmakedefine01 ENABLE_MEDIA_SOURCE
-#cmakedefine01 ENABLE_MEDIA_STATISTICS
-#cmakedefine01 ENABLE_MEDIA_STREAM
-#cmakedefine01 ENABLE_MEMORY_SAMPLER
-#cmakedefine01 ENABLE_METER_ELEMENT
-#cmakedefine01 ENABLE_MHTML
-#cmakedefine01 ENABLE_MINIBROWSER
-#cmakedefine01 ENABLE_MOUSE_CURSOR_SCALE
-#cmakedefine01 ENABLE_NAVIGATOR_CONTENT_UTILS
-#cmakedefine01 ENABLE_NAVIGATOR_HWCONCURRENCY
-#cmakedefine01 ENABLE_NOSNIFF
-#cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API
-#cmakedefine01 ENABLE_NETWORK_PROCESS
-#cmakedefine01 ENABLE_NOTIFICATIONS
-#cmakedefine01 ENABLE_ORIENTATION_EVENTS
-#cmakedefine01 ENABLE_PDFKIT_PLUGIN
-#cmakedefine01 ENABLE_PERFORMANCE_TIMELINE
-#cmakedefine01 ENABLE_PICTURE_SIZES
-#cmakedefine01 ENABLE_POINTER_LOCK
-#cmakedefine01 ENABLE_PROMISES
-#cmakedefine01 ENABLE_PROXIMITY_EVENTS
-#cmakedefine01 ENABLE_PUBLIC_SUFFIX_LIST
-#cmakedefine01 ENABLE_QUOTA
-#cmakedefine01 ENABLE_REMOTE_INSPECTOR
-#cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
-#cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
-#cmakedefine01 ENABLE_RESOURCE_TIMING
-#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
-#cmakedefine01 ENABLE_SECCOMP_FILTERS
-#cmakedefine01 ENABLE_SERVICE_CONTROLS
-#cmakedefine01 ENABLE_SMOOTH_SCROLLING
-#cmakedefine01 ENABLE_SPELLCHECK
-#cmakedefine01 ENABLE_STREAMS_API
-#cmakedefine01 ENABLE_SUBTLE_CRYPTO
-#cmakedefine01 ENABLE_SVG_FONTS
-#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
-#cmakedefine01 ENABLE_TEMPLATE_ELEMENT
-#cmakedefine01 ENABLE_TEXT_AUTOSIZING
-#cmakedefine01 ENABLE_TOUCH_EVENTS
-#cmakedefine01 ENABLE_TOUCH_SLIDER
-#cmakedefine01 ENABLE_TOUCH_ICON_LOADING
-#cmakedefine01 ENABLE_USERSELECT_ALL
-#cmakedefine01 ENABLE_USER_MESSAGE_HANDLERS
-#cmakedefine01 ENABLE_USER_TIMING
-#cmakedefine01 ENABLE_VIBRATION
-#cmakedefine01 ENABLE_VIDEO
-#cmakedefine01 ENABLE_VIDEO_TRACK
-#cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
-#cmakedefine01 ENABLE_WEBGL
-#cmakedefine01 ENABLE_WEBVTT_REGIONS
-#cmakedefine01 ENABLE_WEB_AUDIO
-#cmakedefine01 ENABLE_WEB_REPLAY
-#cmakedefine01 ENABLE_WEB_SOCKETS
-#cmakedefine01 ENABLE_WEB_TIMING
-#cmakedefine01 ENABLE_XHR_TIMEOUT
-#cmakedefine01 ENABLE_XSLT
-#cmakedefine01 USE_SYSTEM_MALLOC
-#cmakedefine01 WTF_USE_GEOCLUE2
-#cmakedefine01 HAVE_LLVM
-#cmakedefine01 HAVE_GTK_UNIX_PRINTING
-#cmakedefine01 WTF_CPU_ARM64_CORTEXA53
-
-#if defined(BUILDING_GTK__) && !defined(GTK_API_VERSION_2)
-#define GDK_VERSION_MIN_REQUIRED @GDK_VERSION_MIN_REQUIRED@
-#endif
-
-#endif /* CMAKECONFIG_H */
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Tools/ChangeLog 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-22 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] Autogenerate cmakeconfig.h.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=143997
+
+ Reviewed by Csaba Osztrogonác.
+
+ * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Add XP_UNIX to the command-line
+ definitions since TestNetscapePlugIn does not use cmakeconfig.h.
+
</ins><span class="cx"> 2015-04-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r182879): Images and video can no longer be downloaded
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (183415 => 183416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2015-04-27 20:28:55 UTC (rev 183415)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2015-04-27 20:30:15 UTC (rev 183416)
</span><span class="lines">@@ -42,6 +42,10 @@
</span><span class="cx"> ${X11_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (WTF_OS_UNIX)
+ add_definitions(-DXP_UNIX)
+endif ()
+
</ins><span class="cx"> add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES})
</span><span class="cx"> target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES})
</span><span class="cx"> set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
</span></span></pre>
</div>
</div>
</body>
</html>