Changeset 183491 in webkit

Timestamp:

Apr 28, 2015 11:01:57 AM (9 years ago)

Author:

Michael Catanzaro

Message:

[GTK] Make all options actually options
​https://bugs.webkit.org/show_bug.cgi?id=144106

Reviewed by Martin Robinson.

Use WEBKIT_OPTION_DEFINE to set ENABLE_GTKDOC, ENABLE_INTROSPECTION, ENABLE_X11_TARGET, and
ENABLE_WAYLAND_TARGET.

• Source/cmake/OptionsGTK.cmake:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2015-04-28  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Make all options actually options
+        https://bugs.webkit.org/show_bug.cgi?id=144106
+
+        Reviewed by Martin Robinson.
+
+        Use WEBKIT_OPTION_DEFINE to set ENABLE_GTKDOC, ENABLE_INTROSPECTION, ENABLE_X11_TARGET, and
+        ENABLE_WAYLAND_TARGET.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2015-04-28  Michael Catanzaro <mcatanzaro@igalia.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -12 +12 @@
 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 42 0 5)
 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 19 3 1)
-
-set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
-set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
-set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
-set(ENABLE_INTROSPECTION ON CACHE BOOL "Whether to enable GObject introspection.")
 
 # These are shared variables, but we special case their definition so that we can use the
@@ -57 +52 @@
 endif ()
 
-if (ENABLE_X11_TARGET)
-    # With cmake 3.2.x we have to explicitly ask for X11 otherwise the X11_X11_LIB
-    # variable won't be set thus the X11 linker flags won't be added and the build
-    # will fail.
-    find_package(X11 REQUIRED)
-endif ()
-
-if (ENABLE_WAYLAND_TARGET)
-    find_package(Wayland REQUIRED)
-endif ()
-
 WEBKIT_OPTION_BEGIN()
 
 WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC OFF)
+WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
+WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC OFF)
 
 WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)
@@ -79 +67 @@
 # FIXME: Can we use cairo-glesv2 to avoid this conflict?
 WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
+
+# FIXME: Should be possible to build with support for both X11 and Wayland.
+WEBKIT_OPTION_CONFLICT(ENABLE_WAYLAND_TARGET ENABLE_X11_TARGET)
 
 WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
@@ -150 +141 @@
 # can't check ENABLE_X11_TARGET at this point because we don't know whether it's enabled until
 # WEBKIT_OPTION_END has been called, and at that point it's too late to change default values.
-#
-# FIXME The above is not quite true yet because ENABLE_X11_TARGET is not yet an option, bug #144106.
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIRO_GL_FOUND})
 
@@ -258 +247 @@
 add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
 
+if (ENABLE_X11_TARGET)
+    find_package(X11 REQUIRED)
+endif ()
+
+if (ENABLE_WAYLAND_TARGET)
+    find_package(Wayland REQUIRED)
+endif ()
+
 if (ENABLE_OPENGL)
     # ENABLE_OPENGL is true if either WTF_USE_OPENGL or ENABLE_GLES2 is true.