From 898c72b21faa0b3010761b11a4dfe4b987d9dd33 Mon Sep 17 00:00:00 2001 From: Remo E Date: Thu, 1 Feb 2018 19:37:02 +0100 Subject: [PATCH] fix: FindRocksDB.cmake for MacOSX Remove some unneeded flags. Tested with RocksDB 5.9.2 on MacOSX 10.13 without any hacks. It finds the library on standard paths. It also works with CMAKE_FIND_ROOT_PATH and CMAKE_PREFIX_PATH --- CMakeModules/FindRocksDB.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeModules/FindRocksDB.cmake b/CMakeModules/FindRocksDB.cmake index 17fb335d16..868228b1a5 100644 --- a/CMakeModules/FindRocksDB.cmake +++ b/CMakeModules/FindRocksDB.cmake @@ -5,11 +5,9 @@ SET(ROCKSDB_DIR "" CACHE PATH "Root directory of RocksDB distribution") FIND_PATH(ROCKSDB_INCLUDE_DIR rocksdb/db.h PATHS ${ROCKSDB_DIR} - NO_DEFAULT_PATH - PATH_SUFFIXES include ) -find_library(ROCKSDB_LIBRARY NAMES ROCKSDBLIB +find_library(ROCKSDB_LIBRARY NAMES ROCKSDBLIB rocksdb PATHS ${ROCKSDB_DIR} ${ROCKSDB_DIR}/bin/Release @@ -18,7 +16,7 @@ find_library(ROCKSDB_LIBRARY NAMES ROCKSDBLIB ) -find_library(ROCKSDB_LIBRARY_DEBUG NAMES ROCKSDBLIB +find_library(ROCKSDB_LIBRARY_DEBUG NAMES ROCKSDBLIB rocksdb PATHS ${ROCKSDB_DIR} ${ROCKSDB_DIR}/bin/Debug