-set(LIBS3_BUILD_DIR "${CMAKE_SOURCE_DIR}/libs3-1.4/build")
-include_directories("${LIBS3_BUILD_DIR}/include")
-link_directories("${LIBS3_BUILD_DIR}/lib")
+set(KVSTORE_DIR "${CMAKE_SOURCE_DIR}/kvstore")
+include_directories("${LIBS3_BUILD_DIR}/include" ${KVSTORE_DIR})
+link_directories("${LIBS3_BUILD_DIR}/lib" ${KVSTORE_DIR})