Changeset 184062 in webkit

Timestamp:

May 10, 2015, 8:03:07 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake] Some macros need to be defined/undefined, rather than ON/OFF
​https://bugs.webkit.org/show_bug.cgi?id=144845

Patch by Philip Chimento <​philip.chimento@gmail.com> on 2015-05-10
Reviewed by Martin Robinson.

• Source/cmake/OptionsGTK.cmake: Only define MOZ_X11 and XP_UNIX

if their corresponding WTF options are ON. The code in npapi.h
relies on these being undefined if they are to be switched off.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2015-05-10  Philip Chimento  <philip.chimento@gmail.com>
+
+        [CMake] Some macros need to be defined/undefined, rather than ON/OFF
+        https://bugs.webkit.org/show_bug.cgi?id=144845
+
+        Reviewed by Martin Robinson.
+
+        * Source/cmake/OptionsGTK.cmake: Only define MOZ_X11 and XP_UNIX
+        if their corresponding WTF options are ON. The code in npapi.h
+        relies on these being undefined if they are to be switched off.
+
 2015-05-09  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -189 +189 @@
 
 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})
+
+# MOZ_X11 and XP_UNIX are required by npapi.h. Their value is not checked;
+# only their definedness is. They should only be defined in the true case.
+if (${ENABLE_X11_TARGET})
+    SET_AND_EXPOSE_TO_BUILD(MOZ_X11 1)
+endif ()
+if (${WTF_OS_UNIX})
+    SET_AND_EXPOSE_TO_BUILD(XP_UNIX 1)
+endif ()
 
 set(USE_UDIS86 ON)