Title: [184335] trunk
- Revision
- 184335
- Author
- [email protected]
- Date
- 2015-05-14 03:52:20 -0700 (Thu, 14 May 2015)
Log Message
[GTK] Enable plugin-related CMake options and variables for the X11 target only
https://bugs.webkit.org/show_bug.cgi?id=144995
Reviewed by Carlos Garcia Campos.
* Source/cmake/OptionsGTK.cmake: Plugins are only supported for
the X11 windowing target at the moment, so the following options
and variables should be enabled or disabled accordingly:
- ENABLE_PLUGIN_PROCESS_GTK2
- ENABLE_NETSCAPE_PLUGIN_API
- ENABLE_PLUGIN_PROCESS
Modified Paths
Diff
Modified: trunk/ChangeLog (184334 => 184335)
--- trunk/ChangeLog 2015-05-14 09:33:54 UTC (rev 184334)
+++ trunk/ChangeLog 2015-05-14 10:52:20 UTC (rev 184335)
@@ -1,3 +1,17 @@
+2015-05-14 Zan Dobersek <[email protected]>
+
+ [GTK] Enable plugin-related CMake options and variables for the X11 target only
+ https://bugs.webkit.org/show_bug.cgi?id=144995
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake: Plugins are only supported for
+ the X11 windowing target at the moment, so the following options
+ and variables should be enabled or disabled accordingly:
+ - ENABLE_PLUGIN_PROCESS_GTK2
+ - ENABLE_NETSCAPE_PLUGIN_API
+ - ENABLE_PLUGIN_PROCESS
+
2015-05-12 Ryuan Choi <[email protected]>
Linker fails without -DDEVELOPER_MODE=ON
Modified: trunk/Source/cmake/OptionsGTK.cmake (184334 => 184335)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-14 09:33:54 UTC (rev 184334)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-14 10:52:20 UTC (rev 184335)
@@ -68,6 +68,8 @@
WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
+WEBKIT_OPTION_DEPEND(ENABLE_NETSCAPE_PLUGIN_API ENABLE_X11_TARGET)
+WEBKIT_OPTION_DEPEND(ENABLE_PLUGIN_PROCESS_GTK2 ENABLE_X11_TARGET)
WEBKIT_OPTION_DEPEND(ENABLE_THREADED_COMPOSITOR ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_OPENGL)
@@ -202,7 +204,7 @@
set(USE_UDIS86 ON)
set(ENABLE_WEBKIT OFF)
set(ENABLE_WEBKIT2 ON)
-set(ENABLE_PLUGIN_PROCESS ON)
+set(ENABLE_PLUGIN_PROCESS ${ENABLE_X11_TARGET})
add_definitions(-DBUILDING_GTK__=1)
add_definitions(-DGETTEXT_PACKAGE="WebKit2GTK-${WEBKITGTK_API_VERSION}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
