[GTK] Enable plugin-related CMake options and variables for the X11 target only
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 May 2015 10:52:20 +0000 (10:52 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 May 2015 10:52:20 +0000 (10:52 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@184335 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/OptionsGTK.cmake

index a02b96a..701c81a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-05-14  Zan Dobersek  <zdobersek@igalia.com>
+
+        [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  <ryuan.choi@navercorp.com>
 
         Linker fails without -DDEVELOPER_MODE=ON
index 6c5b221..3300741 100644 (file)
@@ -68,6 +68,8 @@ WEBKIT_OPTION_CONFLICT(ENABLE_WAYLAND_TARGET ENABLE_X11_TARGET)
 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 @@ endif ()
 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}")