From 544dad3ef87acd87be934b09e861baa5c2406686 Mon Sep 17 00:00:00 2001 From: Michael Vrable Date: Tue, 16 Feb 2010 14:48:12 -0800 Subject: [PATCH] Link kvstore into main build system. --- CMakeLists.txt | 1 + bluesky/CMakeLists.txt | 2 +- bluesky/{s3store.c => store-s3.c} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename bluesky/{s3store.c => store-s3.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7c573d..50bf118 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ pkg_check_modules(GLIB REQUIRED glib-2.0 gthread-2.0) set(LIBS3_BUILD_DIR "${CMAKE_SOURCE_DIR}/libs3-1.4/build") add_definitions(-D_FILE_OFFSET_BITS=64) +add_subdirectory(kvstore) add_subdirectory(bluesky) add_subdirectory(nfs3) add_subdirectory(microbench) diff --git a/bluesky/CMakeLists.txt b/bluesky/CMakeLists.txt index 93b7cb9..2dfe8ef 100644 --- a/bluesky/CMakeLists.txt +++ b/bluesky/CMakeLists.txt @@ -4,7 +4,7 @@ link_directories("${LIBS3_BUILD_DIR}/lib" ${KVSTORE_DIR}) add_library(bluesky SHARED cache.c crypto.c debug.c dir.c file.c init.c inode.c serialize.c - store.c store-kv.cc s3store.c util.c) + store.c store-kv.cc store-s3.c util.c) add_executable(bluesky-test main.c) set(CMAKE_C_FLAGS "-Wall -std=gnu99 ${CMAKE_C_FLAGS}") diff --git a/bluesky/s3store.c b/bluesky/store-s3.c similarity index 100% rename from bluesky/s3store.c rename to bluesky/store-s3.c -- 2.20.1