diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2019-07-03 16:08:26 +0300 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2019-07-03 16:08:26 +0300 |
commit | 099007c3c92d1405625777fa86d2fba3da1d339c (patch) | |
tree | a07ec82f1b77ab50ac3c9e85ffccbe072b6cebff | |
parent | 7d580ad141764e3751922ac9d349ae92ac6dc409 (diff) | |
download | mariadb-git-099007c3c92d1405625777fa86d2fba3da1d339c.tar.gz |
MDEV-19936: MyRocks: compile fails on Windows
Part#2: Remove other unneeded files which cause compile
warnings-treated-as-errors errors on Windows.
-rw-r--r-- | storage/rocksdb/build_rocksdb.cmake | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index 22ec9f324f6..fb2dbe078ad 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -171,9 +171,19 @@ set(LIBS ${ROCKSDB_LIBS} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) #add_subdirectory(${ROCKSDB_SOURCE_DIR}/tools) # Main library source code -# Note : table/mock_table.cc must not be in the below list as it causes -# compile warnings-treated-as-errors on Windows, and it is only used in -# RocksDB's tests. +# Note : RocksDB has a lot of unittests. We should not include these files +# in the build, because 1. they are not needed and 2. gtest causes warnings +# in windows build, which are treated as errors and cause the build to fail. +# +# Unit tests themselves: +# - *_test.cc +# - *_bench.cc +# +# - table/mock_table.cc +# - utilities/cassandra/cassandra_compaction_filter.cc +# - utilities/cassandra/format.cc +# - utilities/cassandra/merge_operator.cc +# - utilities/cassandra/test_utils.cc # set(ROCKSDB_SOURCES cache/clock_cache.cc @@ -254,7 +264,6 @@ set(ROCKSDB_SOURCES memtable/alloc_tracker.cc memtable/hash_linklist_rep.cc memtable/hash_skiplist_rep.cc - memtable/memtablerep_bench.cc memtable/skiplistrep.cc memtable/vectorrep.cc memtable/write_buffer_manager.cc @@ -310,7 +319,6 @@ set(ROCKSDB_SOURCES table/sst_file_reader.cc table/sst_file_writer.cc table/table_properties.cc - table/table_reader_bench.cc table/two_level_iterator.cc test_util/sync_point.cc test_util/sync_point_impl.cc @@ -340,10 +348,6 @@ set(ROCKSDB_SOURCES utilities/blob_db/blob_log_format.cc utilities/blob_db/blob_log_reader.cc utilities/blob_db/blob_log_writer.cc - utilities/cassandra/cassandra_compaction_filter.cc - utilities/cassandra/format.cc - utilities/cassandra/merge_operator.cc - utilities/cassandra/test_utils.cc utilities/checkpoint/checkpoint_impl.cc utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc utilities/convenience/info_log_finder.cc @@ -363,8 +367,6 @@ set(ROCKSDB_SOURCES utilities/persistent_cache/block_cache_tier.cc utilities/persistent_cache/block_cache_tier_file.cc utilities/persistent_cache/block_cache_tier_metadata.cc - utilities/persistent_cache/hash_table_bench.cc - utilities/persistent_cache/persistent_cache_bench.cc utilities/persistent_cache/persistent_cache_tier.cc utilities/persistent_cache/volatile_tier_impl.cc utilities/simulator_cache/sim_cache.cc @@ -386,7 +388,6 @@ set(ROCKSDB_SOURCES utilities/ttl/db_ttl_impl.cc utilities/write_batch_with_index/write_batch_with_index.cc utilities/write_batch_with_index/write_batch_with_index_internal.cc - util/log_write_bench.cc util/murmurhash.cc util/random.cc util/rate_limiter.cc |