Changeset 225888 in webkit

Timestamp:

Dec 13, 2017 5:45:03 PM (6 years ago)

Author:

clopez@igalia.com

Message:

[WPE] WebCrypto should be a public option.
​https://bugs.webkit.org/show_bug.cgi?id=180780

Reviewed by Konstantin Tokarev.

Make ENABLE_WEB_CRYPTO public and lower the dependency requirements
when this option is not enabled. This is also how the GTK+ port
configures the visibility of this option and its dependencies.

• Source/cmake/OptionsWPE.cmake:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2017-12-13  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [WPE] WebCrypto should be a public option.
+        https://bugs.webkit.org/show_bug.cgi?id=180780
+
+        Reviewed by Konstantin Tokarev.
+
+        Make ENABLE_WEB_CRYPTO public and lower the dependency requirements
+        when this option is not enabled. This is also how the GTK+ port
+        configures the visibility of this option and its dependencies.
+
+        * Source/cmake/OptionsWPE.cmake:
+
 2017-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/cmake/OptionsWPE.cmake

@@ -18 +18 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
@@ -61 +62 @@
 find_package(JPEG REQUIRED)
 find_package(LibEpoxy 1.4.0 REQUIRED)
-find_package(LibGcrypt 1.7.0 REQUIRED)
+find_package(LibGcrypt 1.6.0 REQUIRED)
 find_package(LibSoup 2.42.0 REQUIRED)
-find_package(Libtasn1 REQUIRED)
 find_package(LibXml2 2.8.0 REQUIRED)
 find_package(PNG REQUIRED)
@@ -74 +74 @@
 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 ()