From 12520ac61e100f4e89c2b0309d0bd985d481f789 Mon Sep 17 00:00:00 2001 From: "mcatanzaro@igalia.com" Date: Sun, 6 Mar 2016 01:20:45 +0000 Subject: [PATCH] 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: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@197623 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 7 +++++++ Source/WebCore/ChangeLog | 7 +++++++ Source/WebCore/PlatformEfl.cmake | 9 ++------- Source/WebCore/PlatformGTK.cmake | 9 ++------- Source/cmake/OptionsEfl.cmake | 5 +---- Source/cmake/OptionsGTK.cmake | 8 +------- 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index b567338..7f08b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-03-05 Michael Catanzaro + + 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 [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK. diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 6f65071..ff73248 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,10 @@ +2016-03-05 Michael Catanzaro + + Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency + + * PlatformEfl.cmake: + * PlatformGTK.cmake: + 2016-03-05 Simon Fraser Add support for the object-position CSS property diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake index 69d1c5c..ece2c53 100644 --- a/Source/WebCore/PlatformEfl.cmake +++ b/Source/WebCore/PlatformEfl.cmake @@ -282,6 +282,7 @@ list(APPEND WebCore_LIBRARIES ${GLIB_GIO_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES} ${GLIB_LIBRARIES} + ${GNUTLS_LIBRARIES} ${HARFBUZZ_LIBRARIES} ${LIBSOUP_LIBRARIES} ${LIBXML2_LIBRARIES} @@ -307,6 +308,7 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES ${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 @@ if (ENABLE_SUBTLE_CRYPTO) 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) diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake index 7726063..819f5eb 100644 --- a/Source/WebCore/PlatformGTK.cmake +++ b/Source/WebCore/PlatformGTK.cmake @@ -259,6 +259,7 @@ list(APPEND WebCore_LIBRARIES ${GLIB_GMODULE_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES} ${GLIB_LIBRARIES} + ${GNUTLS_LIBRARIES} ${GUDEV_LIBRARIES} ${HARFBUZZ_LIBRARIES} ${LIBSECRET_LIBRARIES} @@ -283,6 +284,7 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES ${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 @@ if (ENABLE_SUBTLE_CRYPTO) crypto/keys/CryptoKeyHMAC.cpp crypto/keys/CryptoKeySerializationRaw.cpp ) - - list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES - ${GNUTLS_INCLUDE_DIRS} - ) - list(APPEND WebCore_LIBRARIES - ${GNUTLS_LIBRARIES} - ) endif () diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index 8f21323..0a55cae 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -145,6 +145,7 @@ WEBKIT_OPTION_END() # 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 @@ if (ENABLE_FTL_JIT AND NOT WTF_CPU_X86_64 AND NOT DEVELOPER_MODE) 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) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake index c35b1e1..54671fe 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -33,6 +33,7 @@ set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") 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 @@ if (ENABLE_SPELLCHECK) 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) -- 1.8.3.1