Title: [197623] trunk
- Revision
- 197623
- Author
- mcatanz...@igalia.com
- Date
- 2016-03-05 17:20:45 -0800 (Sat, 05 Mar 2016)
Log Message
Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (197622 => 197623)
--- trunk/ChangeLog 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/ChangeLog 2016-03-06 01:20:45 UTC (rev 197623)
@@ -1,3 +1,10 @@
+2016-03-05 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
2016-03-02 Konstantin Tokarev <annu...@yandex.ru>
[cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
Modified: trunk/Source/WebCore/ChangeLog (197622 => 197623)
--- trunk/Source/WebCore/ChangeLog 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/WebCore/ChangeLog 2016-03-06 01:20:45 UTC (rev 197623)
@@ -1,3 +1,10 @@
+2016-03-05 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+
2016-03-05 Simon Fraser <simon.fra...@apple.com>
Add support for the object-position CSS property
Modified: trunk/Source/WebCore/PlatformEfl.cmake (197622 => 197623)
--- trunk/Source/WebCore/PlatformEfl.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-03-06 01:20:45 UTC (rev 197623)
@@ -282,6 +282,7 @@
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
+ ${GNUTLS_LIBRARIES}
${HARFBUZZ_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBXML2_LIBRARIES}
@@ -307,6 +308,7 @@
${FREETYPE2_INCLUDE_DIRS}
${GEOCLUE_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
+ ${GNUTLS_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
@@ -443,13 +445,6 @@
crypto/keys/CryptoKeyHMAC.cpp
crypto/keys/CryptoKeySerializationRaw.cpp
)
-
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${GNUTLS_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${GNUTLS_LIBRARIES}
- )
endif ()
if (DEVELOPER_MODE)
Modified: trunk/Source/WebCore/PlatformGTK.cmake (197622 => 197623)
--- trunk/Source/WebCore/PlatformGTK.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-03-06 01:20:45 UTC (rev 197623)
@@ -259,6 +259,7 @@
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
+ ${GNUTLS_LIBRARIES}
${GUDEV_LIBRARIES}
${HARFBUZZ_LIBRARIES}
${LIBSECRET_LIBRARIES}
@@ -283,6 +284,7 @@
${GEOCLUE_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
+ ${GNUTLS_INCLUDE_DIRS}
${GUDEV_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
@@ -818,11 +820,4 @@
crypto/keys/CryptoKeyHMAC.cpp
crypto/keys/CryptoKeySerializationRaw.cpp
)
-
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${GNUTLS_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${GNUTLS_LIBRARIES}
- )
endif ()
Modified: trunk/Source/cmake/OptionsEfl.cmake (197622 => 197623)
--- trunk/Source/cmake/OptionsEfl.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-03-06 01:20:45 UTC (rev 197623)
@@ -145,6 +145,7 @@
# Begin to find necessary packages for EFL port.
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
+find_package(GnuTLS 3.0.0 REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
find_package(LibXslt 1.1.7 REQUIRED)
find_package(ICU REQUIRED)
@@ -289,10 +290,6 @@
message(FATAL_ERROR "FTL JIT is only available on X86_64 architecture.")
endif ()
-if (ENABLE_SUBTLE_CRYPTO)
- find_package(GnuTLS 3.0.0 REQUIRED)
-endif ()
-
if (USE_LIBHYPHEN)
find_package(Hyphen)
if (NOT HYPHEN_FOUND)
Modified: trunk/Source/cmake/OptionsGTK.cmake (197622 => 197623)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-03-06 01:20:45 UTC (rev 197623)
@@ -33,6 +33,7 @@
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype2 2.4.2 REQUIRED)
+find_package(GnuTLS 3.0.0 REQUIRED)
find_package(GTK3 3.6.0 REQUIRED)
find_package(GDK3 3.6.0 REQUIRED)
find_package(HarfBuzz 0.9.2 REQUIRED)
@@ -326,13 +327,6 @@
endif ()
endif ()
-if (ENABLE_SUBTLE_CRYPTO)
- find_package(GnuTLS 3.0.0)
- if (NOT GNUTLS_FOUND)
- message(FATAL_ERROR "GnuTLS is needed for ENABLE_SUBTLE_CRYPTO")
- endif ()
-endif ()
-
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
set(GSTREAMER_COMPONENTS app pbutils)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
