PragmaTwice commented on code in PR #584:
URL: https://github.com/apache/incubator-kvrocks/pull/584#discussion_r902708795


##########
.gitignore:
##########
@@ -44,4 +44,10 @@ Makefile.dep
 make_config.mk
 .vscode
 kvrocks2redis
+<<<<<<< HEAD
 build
+=======
+
+build/
+external/
+>>>>>>>  feat: add lz4.cmake

Review Comment:
   could you try to resolve the conflict?



##########
cmake/rocksdb.cmake:
##########
@@ -38,10 +38,14 @@ FetchContent_GetProperties(snappy)
 FetchContent_MakeAvailableWithArgs(rocksdb
   CMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake/modules # to locate 
FindJeMalloc.cmake
   Snappy_DIR=${PROJECT_SOURCE_DIR}/cmake/modules # to locate SnappyConfig.cmake
+  lz4_ROOT_DIR=${LZ4_LIB_SOURCE_DIR}
+  lz4_LIBRARIES=${LZ4_LIB_SOURCE_DIR}/liblz4.a
+  lz4_INCLUDE_DIRS=${LZ4_LIB_SOURCE_DIR}

Review Comment:
   maybe you should replace these to dir in `${lz4_SOURCE_DIR}/lib`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to