Changeset 183192 in webkit


Ignore:
Timestamp:
Apr 23, 2015 10:29:34 AM (9 years ago)
Author:
Michael Catanzaro
Message:

[GTK] Fixups for ENABLE_CREDENTIAL_STORAGE
https://bugs.webkit.org/show_bug.cgi?id=144102

Reviewed by Martin Robinson.

Use WEBKIT_OPTION_DEFAULT_PORT_VALUE to set ENABLE_CREDENTIAL_STORAGE instead of doing so
manually. Fail the build if libsecret is not found but ENABLE_CREDENTIAL_STORAGE is set.
Also, do not set ENABLE_CREDENTIAL_STORAGE redundantly.

  • Source/cmake/OptionsGTK.cmake:
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r183159 r183192  
     12015-04-23  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [GTK] Fixups for ENABLE_CREDENTIAL_STORAGE
     4        https://bugs.webkit.org/show_bug.cgi?id=144102
     5
     6        Reviewed by Martin Robinson.
     7
     8        Use WEBKIT_OPTION_DEFAULT_PORT_VALUE to set ENABLE_CREDENTIAL_STORAGE instead of doing so
     9        manually. Fail the build if libsecret is not found but ENABLE_CREDENTIAL_STORAGE is set.
     10        Also, do not set ENABLE_CREDENTIAL_STORAGE redundantly.
     11
     12        * Source/cmake/OptionsGTK.cmake:
     13
    1142015-04-22  Michael Catanzaro  <mcatanzaro@igalia.com>
    215
  • trunk/Source/cmake/OptionsGTK.cmake

    r183104 r183192  
    1212CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 19 3 1)
    1313
    14 set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
    1514set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
    1615set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
     
    158157WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS PUBLIC OFF)
    159158WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PUBLIC OFF)
     159WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)
    160160WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PUBLIC OFF)
    161161WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PUBLIC OFF)
     
    325325
    326326if (ENABLE_CREDENTIAL_STORAGE)
    327     find_package(Libsecret)
    328     set(ENABLE_CREDENTIAL_STORAGE 1)
     327    find_package(Libsecret REQUIRED)
    329328endif ()
    330329
Note: See TracChangeset for help on using the changeset viewer.