Title: [121914] trunk
- Revision
- 121914
- Author
- rwlb...@webkit.org
- Date
- 2012-07-05 10:46:09 -0700 (Thu, 05 Jul 2012)
Log Message
[CMake] Fix some CMake warnings
https://bugs.webkit.org/show_bug.cgi?id=90558
Fix WebKit options so they match with FeatureList.pm.
Reviewed by Dan Bates.
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (121913 => 121914)
--- trunk/ChangeLog 2012-07-05 17:37:35 UTC (rev 121913)
+++ trunk/ChangeLog 2012-07-05 17:46:09 UTC (rev 121914)
@@ -1,3 +1,15 @@
+2012-07-05 Rob Buis <rb...@rim.com>
+
+ [CMake] Fix some CMake warnings
+ https://bugs.webkit.org/show_bug.cgi?id=90558
+
+ Fix WebKit options so they match with FeatureList.pm.
+
+ Reviewed by Dan Bates.
+
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2012-07-05 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Move Webkit1 before WebKit2 in the build order
Modified: trunk/Source/cmake/WebKitFeatures.cmake (121913 => 121914)
--- trunk/Source/cmake/WebKitFeatures.cmake 2012-07-05 17:37:35 UTC (rev 121913)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2012-07-05 17:46:09 UTC (rev 121914)
@@ -62,6 +62,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VIEWPORT_ADAPTION "Toogle legacy viewport adaption" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEBKIT_BLOB_BUILDER "Toggle Legacy WebKit Blob Builder Support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_LINK_PRERENDER "Toggle pre rendering support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" OFF)
@@ -104,8 +105,8 @@
WEBKIT_OPTION_DEFINE(ENABLE_WORKERS "Toggle Web Workers support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" OFF)
- WEBKIT_OPTION_DEFINE(USE_TILED_BACKING_STORE "Toggle Tiled Backing Store support" OFF)
- WEBKIT_OPTION_DEFINE(USE_WTFURL "Toogle the use of WTFURL for URL parsing" OFF)
+ WEBKIT_OPTION_DEFINE(WTF_USE_TILED_BACKING_STORE "Toggle Tiled Backing Store support" OFF)
+ WEBKIT_OPTION_DEFINE(WTF_USE_WTFURL "Toogle the use of WTFURL for URL parsing" OFF)
ENDMACRO ()
MACRO (WEBKIT_OPTION_END)
Modified: trunk/Source/cmakeconfig.h.cmake (121913 => 121914)
--- trunk/Source/cmakeconfig.h.cmake 2012-07-05 17:37:35 UTC (rev 121913)
+++ trunk/Source/cmakeconfig.h.cmake 2012-07-05 17:46:09 UTC (rev 121914)
@@ -51,6 +51,8 @@
#cmakedefine01 ENABLE_JAVASCRIPT_DEBUGGER
#cmakedefine01 ENABLE_JIT
#cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
+#cmakedefine01 ENABLE_LINK_PREFETCH
+#cmakedefine01 ENABLE_LINK_PRERENDER
#cmakedefine01 ENABLE_LEGACY_WEBKIT_BLOB_BUILDER
#cmakedefine01 ENABLE_MATHML
#cmakedefine01 ENABLE_MEDIA_STREAM
@@ -90,5 +92,7 @@
#cmakedefine01 ENABLE_WORKERS
#cmakedefine01 ENABLE_XSLT
#cmakedefine01 USE_SYSTEM_MALLOC
+#cmakedefine01 WTF_USE_TILED_BACKING_STORE
+#cmakedefine01 WTF_USE_WTFURL
#endif /* CMAKECONFIG_H */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
