Title: [225888] trunk
- Revision
- 225888
- Author
- [email protected]
- Date
- 2017-12-13 17:45:03 -0800 (Wed, 13 Dec 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/ChangeLog (225887 => 225888)
--- trunk/ChangeLog 2017-12-14 01:12:03 UTC (rev 225887)
+++ trunk/ChangeLog 2017-12-14 01:45:03 UTC (rev 225888)
@@ -1,3 +1,16 @@
+2017-12-13 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.19.3 release.
Modified: trunk/Source/cmake/OptionsWPE.cmake (225887 => 225888)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-12-14 01:12:03 UTC (rev 225887)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-12-14 01:45:03 UTC (rev 225888)
@@ -17,6 +17,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
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)
@@ -60,9 +61,8 @@
find_package(ICU REQUIRED)
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)
find_package(Sqlite REQUIRED)
@@ -75,6 +75,16 @@
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 ()
+
if (ENABLE_XSLT)
find_package(LibXslt 1.1.7 REQUIRED)
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
