fixed rocksdb libdir

jdisset · Nov 23, 2020 · 7f4ee21 · 7f4ee21
1 parent 967bbb5
commit 7f4ee21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,18 +21,11 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -g -Wextra -pedantic")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -g -Wall -Wextra -pedantic")
 
 include(build-rocksdb)
+include_directories(${ROCKSDB_INCLUDE_DIR})
 
 find_package(BZip2 REQUIRED)
-#find_package(Zlib REQUIRED)
-#find_package(zstd REQUIRED)
-#find_package(lz4 REQUIRED)
-#find_package(Rocksdb REQUIRED)
-
 include_directories(${BZIP2_INCLUDE_DIR})
-#include_directories(${ZLIB_INCLUDE_DIR})
-#include_directories(${ZSTD_INCLUDE_DIR})
-#include_directories(${LZ4_INCLUDE_DIR})
-include_directories(${ROCKSDB_INCLUDE_DIR})
+
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/external")
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)

diff --git a/cmake/build-rocksdb.cmake b/cmake/build-rocksdb.cmake
@@ -11,6 +11,7 @@ ExternalProject_Add(rocksdb
  INSTALL_DIR ${ROCKSDB_ROOT_DIR}/bin
  CMAKE_ARGS -DUSE_RTTI=1
  -DCMAKE_INSTALL_PREFIX=${ROCKSDB_ROOT_DIR}
+ -DCMAKE_INSTALL_LIBDIR=lib
  -DCMAKE_CXX_STANDARD=17
  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
  -DWITH_TESTS=OFF