Title: [184062] trunk
- Revision
- 184062
- Author
- commit-qu...@webkit.org
- Date
- 2015-05-10 20:03:07 -0700 (Sun, 10 May 2015)
Log 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.chime...@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.
Modified Paths
Diff
Modified: trunk/ChangeLog (184061 => 184062)
--- trunk/ChangeLog 2015-05-11 01:41:13 UTC (rev 184061)
+++ trunk/ChangeLog 2015-05-11 03:03:07 UTC (rev 184062)
@@ -1,3 +1,14 @@
+2015-05-10 Philip Chimento <philip.chime...@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 <y...@yoav.ws>
Remove the PICTURE_SIZES build flag
Modified: trunk/Source/cmake/OptionsGTK.cmake (184061 => 184062)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-11 01:41:13 UTC (rev 184061)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-11 03:03:07 UTC (rev 184062)
@@ -188,10 +188,17 @@
WEBKIT_OPTION_END()
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)
set(ENABLE_WEBKIT OFF)
set(ENABLE_WEBKIT2 ON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
