Title: [88517] trunk
- Revision
- 88517
- Author
- [email protected]
- Date
- 2011-06-09 20:45:07 -0700 (Thu, 09 Jun 2011)
Log Message
2011-06-09 Lucas De Marchi <[email protected]>
Reviewed by Antonio Gomes.
[CMAKE] Never let USER_AGENT defined to nothing
https://bugs.webkit.org/show_bug.cgi?id=62410
This patch is similar to r88342, but sets WEBKIT_USER_AGENT_*
definitions only if that port defined it. A port might prefer to set it
in other place, e.g. a header that is part of the public API (like GTK
does).
By using #cmakedefine instead of #define, if that variable is not set
in CMake it will expand to:
/* #define WEBKIT_USER_AGENT_MAJOR_VERSION */
* Source/cmake/OptionsEfl.cmake:
* Source/cmakeconfig.h.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (88516 => 88517)
--- trunk/ChangeLog 2011-06-10 02:50:43 UTC (rev 88516)
+++ trunk/ChangeLog 2011-06-10 03:45:07 UTC (rev 88517)
@@ -1,3 +1,23 @@
+2011-06-09 Lucas De Marchi <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [CMAKE] Never let USER_AGENT defined to nothing
+ https://bugs.webkit.org/show_bug.cgi?id=62410
+
+ This patch is similar to r88342, but sets WEBKIT_USER_AGENT_*
+ definitions only if that port defined it. A port might prefer to set it
+ in other place, e.g. a header that is part of the public API (like GTK
+ does).
+
+ By using #cmakedefine instead of #define, if that variable is not set
+ in CMake it will expand to:
+
+ /* #define WEBKIT_USER_AGENT_MAJOR_VERSION */
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2011-06-08 Gyuyoung Kim <[email protected]>
Reviewed by Antonio Gomes.
Modified: trunk/Source/cmake/OptionsEfl.cmake (88516 => 88517)
--- trunk/Source/cmake/OptionsEfl.cmake 2011-06-10 02:50:43 UTC (rev 88516)
+++ trunk/Source/cmake/OptionsEfl.cmake 2011-06-10 03:45:07 UTC (rev 88517)
@@ -8,8 +8,8 @@
# Sync with Source/WebCore/Configurations/Version.xcconfig whenever Safari is
# version up.
# -----------------------------------------------------------------------------
-SET(USER_AGENT_VERSION_MAJOR 534)
-SET(USER_AGENT_VERSION_MINOR 16)
+SET(WEBKIT_USER_AGENT_MAJOR_VERSION 534)
+SET(WEBKIT_USER_AGENT_MINOR_VERSION 16)
ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
SET(WTF_PLATFORM_EFL 1)
Modified: trunk/Source/cmakeconfig.h.cmake (88516 => 88517)
--- trunk/Source/cmakeconfig.h.cmake 2011-06-10 02:50:43 UTC (rev 88516)
+++ trunk/Source/cmakeconfig.h.cmake 2011-06-10 03:45:07 UTC (rev 88517)
@@ -1,8 +1,8 @@
#ifndef CMAKECONFIG_H
#define CMAKECONFIG_H
-#define WEBKIT_USER_AGENT_MAJOR_VERSION @USER_AGENT_VERSION_MAJOR@
-#define WEBKIT_USER_AGENT_MINOR_VERSION @USER_AGENT_VERSION_MINOR@
+#cmakedefine WEBKIT_USER_AGENT_MAJOR_VERSION @WEBKIT_USER_AGENT_MAJOR_VERSION@
+#cmakedefine WEBKIT_USER_AGENT_MINOR_VERSION @WEBKIT_USER_AGENT_MINOR_VERSION@
#cmakedefine01 ENABLE_AS_IMAGE
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
