Changeset 197623 in webkit


Ignore:
Timestamp:
Mar 5, 2016 5:20:45 PM (8 years ago)
Author:
Michael Catanzaro
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:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r197468 r197623  
     12016-03-05  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
     4
     5        * Source/cmake/OptionsEfl.cmake:
     6        * Source/cmake/OptionsGTK.cmake:
     7
    182016-03-02  Konstantin Tokarev  <annulen@yandex.ru>
    29

  • trunk/Source/WebCore/ChangeLog

    r197618 r197623  
     12016-03-05  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
     4
     5        * PlatformEfl.cmake:
     6        * PlatformGTK.cmake:
     7
    182016-03-05  Simon Fraser  <simon.fraser@apple.com>
    29

  • trunk/Source/WebCore/PlatformEfl.cmake

    r197575 r197623  
    283283    ${GLIB_GOBJECT_LIBRARIES}
    284284    ${GLIB_LIBRARIES}
     285    ${GNUTLS_LIBRARIES}
    285286    ${HARFBUZZ_LIBRARIES}
    286287    ${LIBSOUP_LIBRARIES}
    … …  
    308309    ${GEOCLUE_INCLUDE_DIRS}
    309310    ${GIO_UNIX_INCLUDE_DIRS}
     311    ${GNUTLS_INCLUDE_DIRS}
    310312    ${LIBXML2_INCLUDE_DIR}
    311313    ${LIBXSLT_INCLUDE_DIR}
    … …  
    444446        crypto/keys/CryptoKeySerializationRaw.cpp
    445447    )
    446 
    447     list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    448         ${GNUTLS_INCLUDE_DIRS}
    449     )
    450     list(APPEND WebCore_LIBRARIES
    451         ${GNUTLS_LIBRARIES}
    452     )
    453448endif ()
    454449

  • trunk/Source/WebCore/PlatformGTK.cmake

    r197575 r197623  
    260260    ${GLIB_GOBJECT_LIBRARIES}
    261261    ${GLIB_LIBRARIES}
     262    ${GNUTLS_LIBRARIES}
    262263    ${GUDEV_LIBRARIES}
    263264    ${HARFBUZZ_LIBRARIES}
    … …  
    284285    ${GIO_UNIX_INCLUDE_DIRS}
    285286    ${GLIB_INCLUDE_DIRS}
     287    ${GNUTLS_INCLUDE_DIRS}
    286288    ${GUDEV_INCLUDE_DIRS}
    287289    ${HARFBUZZ_INCLUDE_DIRS}
    … …  
    819821        crypto/keys/CryptoKeySerializationRaw.cpp
    820822    )
    821 
    822     list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    823         ${GNUTLS_INCLUDE_DIRS}
    824     )
    825     list(APPEND WebCore_LIBRARIES
    826         ${GNUTLS_LIBRARIES}
    827     )
    828 endif ()
     823endif ()

  • trunk/Source/cmake/OptionsEfl.cmake

    r196481 r197623  
    146146find_package(Cairo 1.10.2 REQUIRED)
    147147find_package(Fontconfig 2.8.0 REQUIRED)
     148find_package(GnuTLS 3.0.0 REQUIRED)
    148149find_package(LibXml2 2.8.0 REQUIRED)
    149150find_package(LibXslt 1.1.7 REQUIRED)
    … …  
    290291endif ()
    291292
    292 if (ENABLE_SUBTLE_CRYPTO)
    293     find_package(GnuTLS 3.0.0 REQUIRED)
    294 endif ()
    295 
    296293if (USE_LIBHYPHEN)
    297294    find_package(Hyphen)

  • trunk/Source/cmake/OptionsGTK.cmake

    r196481 r197623  
    3434find_package(Fontconfig 2.8.0 REQUIRED)
    3535find_package(Freetype2 2.4.2 REQUIRED)
     36find_package(GnuTLS 3.0.0 REQUIRED)
    3637find_package(GTK3 3.6.0 REQUIRED)
    3738find_package(GDK3 3.6.0 REQUIRED)
    … …  
    327328endif ()
    328329
    329 if (ENABLE_SUBTLE_CRYPTO)
    330     find_package(GnuTLS 3.0.0)
    331     if (NOT GNUTLS_FOUND)
    332         message(FATAL_ERROR "GnuTLS is needed for ENABLE_SUBTLE_CRYPTO")
    333     endif ()
    334 endif ()
    335 
    336330if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
    337331    set(GSTREAMER_COMPONENTS app pbutils)
Note: See TracChangeset for help on using the changeset viewer.