Changeset 140804 in webkit
- Timestamp:
- Jan 25, 2013 2:18:08 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r140778 r140804 1 2013-01-25 Jussi Kukkonen <jussi.kukkonen@intel.com> 2 3 [CMake][EFL] Build ThirdParty/leveldb when IndexedDB is enabled 4 https://bugs.webkit.org/show_bug.cgi?id=106443 5 6 Reviewed by Laszlo Gombos. 7 8 LevelDB is now included in ThirdParty. Use it when IndexDB is 9 enabled for EFL. 10 11 * Source/cmake/OptionsEfl.cmake: 12 Set WTF_USE_LEVELDB when IndexedDB is enabled 13 1 14 2013-01-24 Keishi Hattori <keishi@webkit.org> 2 15 -
trunk/Source/WebCore/CMakeLists.txt
r140745 r140804 2664 2664 endif () 2665 2665 2666 if (WTF_USE_LEVELDB) 2667 list(APPEND WebCore_INCLUDE_DIRECTORIES 2668 "${THIRDPARTY_DIR}/leveldb/include" 2669 "${THIRDPARTY_DIR}/leveldb" 2670 ) 2671 list(APPEND LEVELDB_SOURCES 2672 ${THIRDPARTY_DIR}/leveldb/db/builder.cc 2673 ${THIRDPARTY_DIR}/leveldb/db/c.cc 2674 ${THIRDPARTY_DIR}/leveldb/db/dbformat.cc 2675 ${THIRDPARTY_DIR}/leveldb/db/db_impl.cc 2676 ${THIRDPARTY_DIR}/leveldb/db/db_iter.cc 2677 ${THIRDPARTY_DIR}/leveldb/db/filename.cc 2678 ${THIRDPARTY_DIR}/leveldb/db/log_reader.cc 2679 ${THIRDPARTY_DIR}/leveldb/db/log_writer.cc 2680 ${THIRDPARTY_DIR}/leveldb/db/memtable.cc 2681 ${THIRDPARTY_DIR}/leveldb/db/repair.cc 2682 ${THIRDPARTY_DIR}/leveldb/db/table_cache.cc 2683 ${THIRDPARTY_DIR}/leveldb/db/version_edit.cc 2684 ${THIRDPARTY_DIR}/leveldb/db/version_set.cc 2685 ${THIRDPARTY_DIR}/leveldb/db/write_batch.cc 2686 ${THIRDPARTY_DIR}/leveldb/helpers/memenv/memenv.cc 2687 ${THIRDPARTY_DIR}/leveldb/port/port_posix.cc 2688 ${THIRDPARTY_DIR}/leveldb/table/block_builder.cc 2689 ${THIRDPARTY_DIR}/leveldb/table/block.cc 2690 ${THIRDPARTY_DIR}/leveldb/table/filter_block.cc 2691 ${THIRDPARTY_DIR}/leveldb/table/format.cc 2692 ${THIRDPARTY_DIR}/leveldb/table/iterator.cc 2693 ${THIRDPARTY_DIR}/leveldb/table/merger.cc 2694 ${THIRDPARTY_DIR}/leveldb/table/table_builder.cc 2695 ${THIRDPARTY_DIR}/leveldb/table/table.cc 2696 ${THIRDPARTY_DIR}/leveldb/table/two_level_iterator.cc 2697 ${THIRDPARTY_DIR}/leveldb/util/arena.cc 2698 ${THIRDPARTY_DIR}/leveldb/util/bloom.cc 2699 ${THIRDPARTY_DIR}/leveldb/util/cache.cc 2700 ${THIRDPARTY_DIR}/leveldb/util/coding.cc 2701 ${THIRDPARTY_DIR}/leveldb/util/comparator.cc 2702 ${THIRDPARTY_DIR}/leveldb/util/crc32c.cc 2703 ${THIRDPARTY_DIR}/leveldb/util/env.cc 2704 ${THIRDPARTY_DIR}/leveldb/util/env_posix.cc 2705 ${THIRDPARTY_DIR}/leveldb/util/filter_policy.cc 2706 ${THIRDPARTY_DIR}/leveldb/util/hash.cc 2707 ${THIRDPARTY_DIR}/leveldb/util/histogram.cc 2708 ${THIRDPARTY_DIR}/leveldb/util/logging.cc 2709 ${THIRDPARTY_DIR}/leveldb/util/options.cc 2710 ${THIRDPARTY_DIR}/leveldb/util/status.cc 2711 ) 2712 endif () 2666 2713 2667 2714 if (WTF_USE_3D_GRAPHICS) … … 3019 3066 add_dependencies(${WebCoreTestSupport_LIBRARY_NAME} ${WebCore_LIBRARY_NAME}) 3020 3067 3068 if (WTF_USE_LEVELDB) 3069 set(LEVELDB_LIBRARY_NAME leveldb) 3070 add_library(${LEVELDB_LIBRARY_NAME} STATIC ${LEVELDB_SOURCES}) 3071 target_link_libraries(${LEVELDB_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT}) 3072 set_target_properties(${LEVELDB_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "LEVELDB_PLATFORM_POSIX=1 OS_LINUX=1") 3073 list(APPEND WebCore_LIBRARIES ${LEVELDB_LIBRARY_NAME}) 3074 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${LEVELDB_LIBRARY_NAME} IGNORECXX_WARNINGS) 3075 endif () 3076 3021 3077 if (WTF_USE_3D_GRAPHICS) 3022 3078 set(ANGLESupport_LIBRARY_NAME ANGLESupport) -
trunk/Source/WebCore/ChangeLog
r140803 r140804 1 2013-01-25 Jussi Kukkonen <jussi.kukkonen@intel.com> 2 3 [CMake][EFL] Build ThirdParty/leveldb when IndexedDB is enabled 4 https://bugs.webkit.org/show_bug.cgi?id=106443 5 6 Reviewed by Laszlo Gombos. 7 8 LevelDB is now included in ThirdParty. Use it when IndexDB is 9 enabled for EFL. 10 11 * CMakeLists.txt: 12 Build ThirdParty/leveldb when WTF_USE_LEVELDB is set 13 1 14 2013-01-25 Kent Tamura <tkent@chromium.org> 2 15 -
trunk/Source/cmake/OptionsEfl.cmake
r139858 r140804 253 253 add_definitions(-DHAVE_ACCESSIBILITY=0) 254 254 endif () 255 256 if (ENABLE_INDEXED_DATABASE) 257 set(WTF_USE_LEVELDB 1) 258 add_definitions(-DWTF_USE_LEVELDB=1) 259 endif ()
Note: See TracChangeset
for help on using the changeset viewer.