Skip to content

Commit

Permalink
Refactors (vesoft-inc#258)
Browse files Browse the repository at this point in the history
* Refactor

1) Refactor: renamed RocksdbEngine to RocksEngine
2) Refactor: Combined RocksdbConfigFlags and RocksdbConfigOptions to RocksEngineConfig
3) Cleaned up RocksdbConfigTest and renamed it to RocksEngineConfigTest
4) Modified third-parties build.sh files to make the build support Ubuntu
5) Modified main CMakeFiles.txt to properly handle libLZMA

* Rebased and addressed @dutor's comments
  • Loading branch information
sherman-the-tank authored and dutor committed Apr 9, 2019
1 parent d9c19c2 commit 7803e72
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ find_package(BISON REQUIRED)
find_package(FLEX REQUIRED)
find_package(Readline REQUIRED)
find_package(NCURSES REQUIRED)
find_package(LibLZMA MODULE)
if(NOT asan AND NOT ENABLE_NATIVE)
find_package(PCHSupport)
add_compile_options(-Winvalid-pch)
Expand Down Expand Up @@ -236,6 +237,10 @@ set(ROCKSDB_LIBRARIES ${NEBULA_HOME}/third-party/rocksdb/_install/lib/librocksdb

# All compression libraries
set(COMPRESSION_LIBRARIES bz2 snappy zstd z)
if (LIBLZMA_FOUND)
include_directories(SYSTEM ${LIBLZMA_INCLUDE_DIRS})
list(APPEND COMPRESSION_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()

if (NOT ENABLE_JEMALLOC)
set(JEMALLOC_LIB )
Expand All @@ -262,9 +267,9 @@ macro(nebula_link_libraries target)
${OPENSSL_CRYPTO_LIBRARY}
${KRB5_LIBRARIES}
${COMPRESSION_LIBRARIES}
dl
${JEMALLOC_LIB}
${LIBUNWIND_LIBRARIES}
dl
-pthread
)
endmacro(nebula_link_libraries)
Expand Down

0 comments on commit 7803e72

Please sign in to comment.