Changeset 147396 in webkit

Timestamp:

Apr 2, 2013 12:11:13 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][CMAKE] Move MOZ_X11 definition from OptionsCommon to OptionsEfl
​https://bugs.webkit.org/show_bug.cgi?id=113685

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-04-02
Reviewed by Martin Robinson.

MOZ_X11 is added unconditionally in OptionsCommon for UNIX
platforms, but not all UNIX platforms use X11 for plugins,
BlackBerry doesn't. The only port using cmake that uses X11 is EFL
and it already has checks for X11, so we can just move the
definition to OptionsEfl.

• Source/cmake/OptionsCommon.cmake:
• Source/cmake/OptionsEfl.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-04-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [EFL][CMAKE] Move MOZ_X11 definition from OptionsCommon to OptionsEfl
+        https://bugs.webkit.org/show_bug.cgi?id=113685
+
+        Reviewed by Martin Robinson.
+
+        MOZ_X11 is added unconditionally in OptionsCommon for UNIX
+        platforms, but not all UNIX platforms use X11 for plugins,
+        BlackBerry doesn't. The only port using cmake that uses X11 is EFL
+        and it already has checks for X11, so we can just move the
+        definition to OptionsEfl.
+
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/OptionsEfl.cmake:
+
 2013-04-01  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -4 +4 @@
 if (WTF_OS_UNIX)
     add_definitions(-DXP_UNIX)
-    #TODO: check for X11 target
-    add_definitions(-DMOZ_X11)
 endif (WTF_OS_UNIX)
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -117 +117 @@
     add_definitions(-DHAVE_ECORE_X)
     add_definitions(-DWTF_PLATFORM_X11=1)
+    add_definitions(-DMOZ_X11)
 endif ()