diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/cmake | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/cmake')
| -rw-r--r-- | Source/cmake/OptionsEfl.cmake | 2 | ||||
| -rw-r--r-- | Source/cmake/WebKitPackaging.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index 3f846fe..b34ec3b 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -77,7 +77,7 @@ WEBKIT_FEATURE(ENABLE_GLIB_SUPPORT "Enable Glib support" DEFAULT ON) WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT ON) WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON) WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON) -WEBKIT_FEATURE(ENABLE_JIT "Enable JIT code" DEFAULT OFF) +WEBKIT_FEATURE(ENABLE_JIT "Enable JIT code" DEFAULT ON) WEBKIT_FEATURE(ENABLE_MATHML "Enable MathML" DEFAULT ON) WEBKIT_FEATURE(ENABLE_NETSCAPE_PLUGIN_API "Enable Netscape plugin API" DEFAULT OFF) WEBKIT_FEATURE(ENABLE_NOTIFICATIONS "Enable notifications" DEFAULT OFF) diff --git a/Source/cmake/WebKitPackaging.cmake b/Source/cmake/WebKitPackaging.cmake index 4c91073..afd519b 100644 --- a/Source/cmake/WebKitPackaging.cmake +++ b/Source/cmake/WebKitPackaging.cmake @@ -140,7 +140,7 @@ IF(NOT DEFINED CPACK_SOURCE_IGNORE_FILES) "/wxcode/" "/Wxcode/" "wxcode\\\\." "Wxcode\\\\." "/WebKitLibraries/" "/English\\\\.lproj/" - "/WebKit2/" + "/Source/WebKit2/" "\\\\.a$" "\\\\.exe$" "\\\\.mm$" |