Changeset 121914 in webkit


Ignore:
Timestamp:
Jul 5, 2012 10:46:09 AM (12 years ago)
Author:
rwlbuis@webkit.org
Message:

[CMake] Fix some CMake warnings
https://bugs.webkit.org/show_bug.cgi?id=90558

Fix WebKit options so they match with FeatureList.pm.

Reviewed by Dan Bates.

  • Source/cmake/WebKitFeatures.cmake:
  • Source/cmakeconfig.h.cmake:
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r121910 r121914  
     12012-07-05  Rob Buis  <rbuis@rim.com>
     2
     3        [CMake] Fix some CMake warnings
     4        https://bugs.webkit.org/show_bug.cgi?id=90558
     5
     6        Fix WebKit options so they match with FeatureList.pm.
     7
     8        Reviewed by Dan Bates.
     9
     10        * Source/cmake/WebKitFeatures.cmake:
     11        * Source/cmakeconfig.h.cmake:
     12
    1132012-07-05  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    214
  • trunk/Source/cmake/WebKitFeatures.cmake

    r120698 r121914  
    6363    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEBKIT_BLOB_BUILDER "Toggle Legacy WebKit Blob Builder Support" OFF)
    6464    WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
     65    WEBKIT_OPTION_DEFINE(ENABLE_LINK_PRERENDER "Toggle pre rendering support" OFF)
    6566    WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
    6667    WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" OFF)
     
    105106    WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
    106107    WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" OFF)
    107     WEBKIT_OPTION_DEFINE(USE_TILED_BACKING_STORE "Toggle Tiled Backing Store support" OFF)
    108     WEBKIT_OPTION_DEFINE(USE_WTFURL "Toogle the use of WTFURL for URL parsing" OFF)
     108    WEBKIT_OPTION_DEFINE(WTF_USE_TILED_BACKING_STORE "Toggle Tiled Backing Store support" OFF)
     109    WEBKIT_OPTION_DEFINE(WTF_USE_WTFURL "Toogle the use of WTFURL for URL parsing" OFF)
    109110ENDMACRO ()
    110111
  • trunk/Source/cmakeconfig.h.cmake

    r121819 r121914  
    5252#cmakedefine01 ENABLE_JIT
    5353#cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
     54#cmakedefine01 ENABLE_LINK_PREFETCH
     55#cmakedefine01 ENABLE_LINK_PRERENDER
    5456#cmakedefine01 ENABLE_LEGACY_WEBKIT_BLOB_BUILDER
    5557#cmakedefine01 ENABLE_MATHML
     
    9193#cmakedefine01 ENABLE_XSLT
    9294#cmakedefine01 USE_SYSTEM_MALLOC
     95#cmakedefine01 WTF_USE_TILED_BACKING_STORE
     96#cmakedefine01 WTF_USE_WTFURL
    9397
    9498#endif /* CMAKECONFIG_H */
Note: See TracChangeset for help on using the changeset viewer.