Title: [226094] trunk/Source/WebCore
- Revision
- 226094
- Author
- [email protected]
- Date
- 2017-12-18 20:09:11 -0800 (Mon, 18 Dec 2017)
Log Message
[GTK][WPE] Conditionalize libTASN1 use behind ENABLE_SUBTLE_CRYPTO in the CMake files
https://bugs.webkit.org/show_bug.cgi?id=180949
Reviewed by Carlos Alberto Lopez Perez.
* PlatformGTK.cmake: Move the include path and library additions to conditional ENABLE_SUBTLE_CRYPTO section.
* PlatformWPE.cmake: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (226093 => 226094)
--- trunk/Source/WebCore/ChangeLog 2017-12-19 04:03:21 UTC (rev 226093)
+++ trunk/Source/WebCore/ChangeLog 2017-12-19 04:09:11 UTC (rev 226094)
@@ -1,3 +1,13 @@
+2017-12-18 Timothy Hatcher <[email protected]>
+
+ [GTK][WPE] Conditionalize libTASN1 use behind ENABLE_SUBTLE_CRYPTO in the CMake files
+ https://bugs.webkit.org/show_bug.cgi?id=180949
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * PlatformGTK.cmake: Move the include path and library additions to conditional ENABLE_SUBTLE_CRYPTO section.
+ * PlatformWPE.cmake: Ditto.
+
2017-12-18 Wenson Hsieh <[email protected]>
[Attachment Support] Support representing pasted or dropped content using attachment elements
Modified: trunk/Source/WebCore/PlatformGTK.cmake (226093 => 226094)
--- trunk/Source/WebCore/PlatformGTK.cmake 2017-12-19 04:03:21 UTC (rev 226093)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-12-19 04:09:11 UTC (rev 226094)
@@ -104,7 +104,6 @@
${GLIB_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBSOUP_LIBRARIES}
- ${LIBTASN1_LIBRARIES}
${HYPHEN_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
${X11_X11_LIB}
@@ -126,7 +125,6 @@
${GLIB_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
- ${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
@@ -172,6 +170,15 @@
)
endif ()
+if (ENABLE_SUBTLE_CRYPTO)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${LIBTASN1_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${LIBTASN1_LIBRARIES}
+ )
+endif ()
+
if (ENABLE_WAYLAND_TARGET)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
${WAYLAND_INCLUDE_DIRS}
Modified: trunk/Source/WebCore/PlatformWPE.cmake (226093 => 226094)
--- trunk/Source/WebCore/PlatformWPE.cmake 2017-12-19 04:03:21 UTC (rev 226093)
+++ trunk/Source/WebCore/PlatformWPE.cmake 2017-12-19 04:09:11 UTC (rev 226094)
@@ -71,7 +71,6 @@
${GLIB_LIBRARIES}
${ICU_LIBRARIES}
${LIBSOUP_LIBRARIES}
- ${LIBTASN1_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
${WPE_LIBRARIES}
)
@@ -82,7 +81,15 @@
${GLIB_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
- ${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
${WPE_INCLUDE_DIRS}
)
+
+if (ENABLE_SUBTLE_CRYPTO)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${LIBTASN1_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${LIBTASN1_LIBRARIES}
+ )
+endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
