Conflicts:
	cmake/CompileRocksDB.cmake
	fdbserver/CMakeLists.txt
This commit is contained in:
Daniel Smith 2020-08-31 20:07:35 +00:00 committed by Russell Sears
parent fb7c0f0591
commit 1b82adde3a
2 changed files with 9 additions and 2 deletions

View File

@ -11,7 +11,7 @@ RUN yum install -y yum-utils &&\
devtoolset-8-libubsan-devel devtoolset-8-valgrind-devel \
rh-python36-python-devel rh-ruby24 golang python27 rpm-build \
mono-core debbuild python-pip dos2unix valgrind-devel ccache \
distcc wget git &&\
distcc wget git lz4 &&\
pip install boto3==1.1.1
USER root

View File

@ -201,7 +201,14 @@ target_include_directories(fdbserver PRIVATE
${CMAKE_BINARY_DIR}/bindings/c
${CMAKE_CURRENT_BINARY_DIR}/workloads
${CMAKE_CURRENT_SOURCE_DIR}/workloads)
target_link_libraries(fdbserver PRIVATE fdbclient fdb_sqlite)
if (WITH_ROCKSDB_EXPERIMENTAL)
add_dependencies(fdbserver rocksdb)
target_include_directories(fdbserver PRIVATE ${ROCKSDB_INCLUDE_DIR})
target_link_libraries(fdbserver PRIVATE fdbclient fdb_sqlite ${ROCKSDB_LIBRARIES} lz4)
else()
target_link_libraries(fdbserver PRIVATE fdbclient fdb_sqlite)
endif()
if (GPERFTOOLS_FOUND)
add_compile_definitions(USE_GPERFTOOLS)
target_link_libraries(fdbserver PRIVATE gperftools)