RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

rocksdb: sync with upstream

Browse Source 
and update the CMakeLists.txt accordingly, as upstream changed the
target name to build the static library.

5647d5e reverted the previous change by accident.

Fixes: http://tracker.ceph.com/issues/18464
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-02-08 16:50:30 +08:00
parent 72d6cd3170
commit da7908b3c4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -758,7 +758,7 @@ if (NOT WITH_SYSTEM_ROCKSDB)
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
CMAKE_ARGS ${ROCKSDB_CMAKE_ARGS}
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/rocksdb
BUILD_COMMAND $(MAKE) rocksdblib
BUILD_COMMAND $(MAKE) rocksdb
INSTALL_COMMAND "true")
# force rocksdb make to be called on each time
@ -772,7 +772,7 @@ if (NOT WITH_SYSTEM_ROCKSDB)
add_library(rocksdb STATIC IMPORTED)
add_dependencies(rocksdb rocksdb_ext)
set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/rocksdb/librocksdblib.a")
set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/rocksdb/librocksdb.a")
set(ROCKSDB_LIBRARIES rocksdb)
endif(NOT WITH_SYSTEM_ROCKSDB)

2
src/rocksdb

@ -1 +1 @@
Subproject commit a0deec960f3a8190831c673e5ba998fe6fb7ea90
Subproject commit 3b4ac8076bff9fd6a8b4ccbc37a1995d08981840