cmake: do not find bzip2/lz4 for rocksdb #19963
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
reviewed
Jan 16, 2018
| @@ -12,13 +12,3 @@ add_library(kv STATIC $<TARGET_OBJECTS:kv_objs>) | |||
| target_include_directories(kv_objs SYSTEM BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR}) | |||
| target_include_directories(kv SYSTEM BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR}) | |||
| target_link_libraries(kv ${LEVELDB_LIBRARIES} ${ROCKSDB_LIBRARIES} ${ALLOC_LIBS} ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES}) | |||
|
|
|||
| # rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same. | |||
There was a problem hiding this comment.
these changes were added to accommodate the Makefile of rocksdb which predates CMakefile of it.
tchaikov
approved these changes
Jan 16, 2018
|
could you update the commit message with the rationale of this change? |
RocksDB has compression disabled by default[1] and it's never been enabled[2], so do not link these compression libraries implicitly [1] https://github.com/ceph/rocksdb/blob/master/CMakeLists.txt#L76 [2] https://github.com/ceph/ceph/blob/master/cmake/modules/BuildRocksDB.cmake Signed-off-by: runsisi <runsisi@zte.com.cn>
|
@tchaikov updated as you suggested, thx! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rocksdb has compression disabled by default[1] and it's never been enabled[2], so do not link these compression libraries implicitly
[1] https://github.com/ceph/rocksdb/blob/master/CMakeLists.txt#L76
[2] https://github.com/ceph/ceph/blob/master/cmake/modules/BuildRocksDB.cmake
Signed-off-by: runsisi runsisi@zte.com.cn