From 22310e030429bc8ca664e66a49f91264ed592b04 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Mon, 27 Jul 2020 13:57:59 +0000 Subject: [PATCH] cmake: fix lz4 params when building rocksdb Recent RocksDB version use slightly different parameter names for the LZ4 include/lib dirs, we'll have to pass the right ones. We'll also have to fix the "CMAKE_TOOLCHAIN_FILE" parameter, which isn't passed properly. Signed-off-by: Lucian Petrut --- cmake/modules/BuildRocksDB.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake index de9748878b7c3..28559ea1cb329 100644 --- a/cmake/modules/BuildRocksDB.cmake +++ b/cmake/modules/BuildRocksDB.cmake @@ -8,7 +8,7 @@ function(build_rocksdb) list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP}) if(CMAKE_TOOLCHAIN_FILE) list(APPEND rocksdb_CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE) + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}) endif() if(ALLOCATOR STREQUAL "jemalloc") @@ -35,8 +35,8 @@ function(build_rocksdb) if(LZ4_FOUND) list(APPEND rocksdb_INTERFACE_LINK_LIBRARIES LZ4::LZ4) # When cross compiling, cmake may fail to locate lz4. - list(APPEND rocksdb_CMAKE_ARGS -DLZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR}) - list(APPEND rocksdb_CMAKE_ARGS -DLZ4_LIBRARIES=${LZ4_LIBRARY}) + list(APPEND rocksdb_CMAKE_ARGS -Dlz4_INCLUDE_DIRS=${LZ4_INCLUDE_DIR}) + list(APPEND rocksdb_CMAKE_ARGS -Dlz4_LIBRARIES=${LZ4_LIBRARY}) endif() list(APPEND rocksdb_CMAKE_ARGS -DWITH_ZLIB=${ZLIB_FOUND}) -- 2.47.3