From: Willem Jan Withagen <wjw@digiware.nl>
Date: Thu, 22 Sep 2016 12:19:09 +0000 (+0200)
Subject: src/kv/CMakeLists.txt: force rocksdb/include to first include directory
X-Git-Tag: v11.0.1~128^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11194%2Fhead;p=ceph.git

src/kv/CMakeLists.txt: force rocksdb/include to first include directory

 - Otherwise on FreeBSD older packages could be used for include
   this then can result to missing declared functions because
   includes and libs are out of sync

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt
index 9bf86be0edb..1a502a9b93e 100644
--- a/src/kv/CMakeLists.txt
+++ b/src/kv/CMakeLists.txt
@@ -5,8 +5,8 @@ set(kv_srcs
   RocksDBStore.cc)
 add_library(kv_objs OBJECT ${kv_srcs})
 add_library(kv STATIC $<TARGET_OBJECTS:kv_objs>)
-target_include_directories(kv_objs PUBLIC ${ROCKSDB_INCLUDE_DIR})
-target_include_directories(kv PUBLIC ${ROCKSDB_INCLUDE_DIR})
+target_include_directories(kv_objs BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR})
+target_include_directories(kv BEFORE PUBLIC ${ROCKSDB_INCLUDE_DIR})
 target_link_libraries(kv ${LEVELDB_LIBRARIES} rocksdb snappy z)
 
 # rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.