Changeset 224492 in webkit

Timestamp:

Nov 6, 2017 8:27:25 AM (6 years ago)

Author:

Michael Catanzaro

Message:

[WPE] Clean up OptionsWPE.cmake
​https://bugs.webkit.org/show_bug.cgi?id=179009

Reviewed by Žan Doberšek.

• Source/cmake/OptionsWPE.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (4 diffs)

trunk/ChangeLog

@@ +1 @@
+2017-11-06  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [WPE] Clean up OptionsWPE.cmake
+        https://bugs.webkit.org/show_bug.cgi?id=179009
+
+        Reviewed by Žan Doberšek.
+
+        * Source/cmake/OptionsWPE.cmake:
+
 2017-11-06  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/cmake/OptionsWPE.cmake

@@ -11 +11 @@
 include(GStreamerDefinitions)
 
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
+# Public options shared with other WebKit ports. Do not add any options here
+# without approval from a WPE reviewer. There must be strong reason to support
+# changing the value of the option.
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
+
+# Private options shared with other WebKit ports. Add options here only if
+# we need a value different from the default defined in WebKitFeatures.cmake.
+# Changing these options is completely unsupported.
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PUBLIC OFF)
+# FIXME: Turn on ENABLE_INDEXED_DATABASE_IN_WORKERS
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)
+# FIXME: Turn on ENABLE_MEDIA_SOURCE
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
@@ -27 +33 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON)
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -52 +57 @@
 set(WebCore_LIBRARY_TYPE STATIC)
 
-find_package(ICU REQUIRED)
-find_package(Threads REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(GLIB 2.40.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
-
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)
 find_package(Freetype2 2.4.2 REQUIRED)
+find_package(GLIB 2.40.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
 find_package(HarfBuzz 0.9.18 REQUIRED)
+find_package(ICU REQUIRED)
 find_package(JPEG REQUIRED)
 find_package(LibEpoxy 1.4.0 REQUIRED)
-find_package(LibGcrypt 1.6.0 REQUIRED)
+find_package(LibGcrypt 1.7.0 REQUIRED)
 find_package(LibSoup 2.42.0 REQUIRED)
 find_package(LibXml2 2.8.0 REQUIRED)
 find_package(PNG REQUIRED)
 find_package(Sqlite REQUIRED)
+find_package(Threads REQUIRED)
 find_package(WebP REQUIRED)
+find_package(WPEBackend REQUIRED)
+find_package(ZLIB REQUIRED)
 
-find_package(WPEBackend REQUIRED)
+if (ENABLE_ACCELERATED_2D_CANVAS)
+    find_package(CairoGL 1.10.2 REQUIRED COMPONENTS cairo-egl)
+endif ()
 
 if (ENABLE_XSLT)
@@ -76 +83 @@
 endif ()
 
-SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
-SET_AND_EXPOSE_TO_BUILD(USE_XDGMIME TRUE)
-SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
-
-if (ENABLE_ACCELERATED_2D_CANVAS)
-    find_package(CairoGL 1.10.2 REQUIRED COMPONENTS cairo-egl)
-endif ()
-
-if (ENABLE_SUBTLE_CRYPTO)
-    find_package(Libtasn1 REQUIRED)
-    if (NOT LIBTASN1_FOUND)
-        message(FATAL_ERROR "libtasn1 is required to enable Web Crypto API support.")
-    endif ()
-    if (LIBGCRYPT_VERSION VERSION_LESS 1.7.0)
-        message(FATAL_ERROR "libgcrypt 1.7.0 is required to enable Web Crypto API support.")
-    endif ()
-endif ()
-
 add_definitions(-DBUILDING_WPE__=1)
 add_definitions(-DGETTEXT_PACKAGE="WPE")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_MAJOR_VERSION="601")
+add_definitions(-DUSER_AGENT_MAJOR_VERSION="605")
 add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 
-set(USE_UDIS86 1)
-
+SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_LIBEPOXY TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES_2 TRUE)
-SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_XDGMIME TRUE)
 
 SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE)