diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/JavaScriptCore/CMakeLists.txt | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/JavaScriptCore/CMakeLists.txt')
| -rw-r--r-- | Source/JavaScriptCore/CMakeLists.txt | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt index 674d272..f18826e 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -10,7 +10,6 @@ SET(JavaScriptCore_INCLUDE_DIRECTORIES "${JAVASCRIPTCORE_DIR}/interpreter" "${JAVASCRIPTCORE_DIR}/jit" "${JAVASCRIPTCORE_DIR}/parser" - "${JAVASCRIPTCORE_DIR}/pcre" "${JAVASCRIPTCORE_DIR}/profiler" "${JAVASCRIPTCORE_DIR}/runtime" "${JAVASCRIPTCORE_DIR}/yarr" @@ -67,12 +66,7 @@ SET(JavaScriptCore_SOURCES parser/Nodes.cpp parser/Parser.cpp parser/ParserArena.cpp - - pcre/pcre_compile.cpp - pcre/pcre_exec.cpp - pcre/pcre_tables.cpp - pcre/pcre_ucp_searchfuncs.cpp - pcre/pcre_xclass.cpp + parser/SourceProviderCache.cpp profiler/Profile.cpp profiler/ProfileGenerator.cpp @@ -87,6 +81,7 @@ SET(JavaScriptCore_SOURCES runtime/BooleanObject.cpp runtime/BooleanPrototype.cpp runtime/CallData.cpp + runtime/MarkedBlock.cpp runtime/MarkedSpace.cpp runtime/Heap.cpp runtime/CommonIdentifiers.cpp @@ -137,6 +132,7 @@ SET(JavaScriptCore_SOURCES runtime/LiteralParser.cpp runtime/Lookup.cpp runtime/MachineStackMarker.cpp + runtime/ConservativeSet.cpp runtime/MarkStack.cpp runtime/MathObject.cpp runtime/NativeErrorConstructor.cpp @@ -208,15 +204,6 @@ ENDFOREACH () GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_DIR}/Lexer.lut.h MAIN_DEPENDENCY) LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Lexer.lut.h) -# GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources) -ADD_CUSTOM_COMMAND( - OUTPUT ${DERIVED_SOURCES_DIR}/chartables.c - MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/pcre/dftables - COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/pcre/dftables --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_DIR}/chartables.c - VERBATIM) -ADD_SOURCE_DEPENDENCIES(${JAVASCRIPTCORE_DIR}/pcre/pcre_tables.cpp ${DERIVED_SOURCES_DIR}/chartables.c) - - #GENERATOR: "RegExpJitTables.h": tables used by Yarr ADD_CUSTOM_COMMAND( OUTPUT ${DERIVED_SOURCES_DIR}/RegExpJitTables.h |