IBM · dwaddington · Feb 21, 2018 · Feb 13, 2018 · Feb 13, 2018 · Feb 14, 2018
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,7 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
+Doxyfile*
+cscope*
+tags
+doc/html*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
+include(mk/common.cmake)
 
 if(NOT DEFINED ENV{COMANCHE_HOME})
   message(SEND_ERROR "COMANCHE_HOME is not defined")

diff --git a/apps/block-perf/CMakeLists.txt b/apps/block-perf/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(block-perf CXX)
 

diff --git a/apps/cuda-dma/CMakeLists.txt b/apps/cuda-dma/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
 project(cuda-dma LANGUAGES CXX)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 #set(CMAKE_CUDA_COMPILER /usr/local/cuda-8.0/bin/nvcc)
 #set(CUDA_TOOLKIT_ROOT_DIR /usr/local/cuda-8.0/)
@@ -21,8 +20,6 @@ message(STATUS "Cuda cublas libraries  : ${CUDA_CUBLAS_LIBRARIES}")
 
 cuda_include_directories($ENV{COMANCHE_HOME}/deps/gdrcopy/)
 cuda_include_directories($ENV{COMANCHE_HOME}/src/components/)
-cuda_include_directories($ENV{COMANCHE_HOME}/src/lib/common/include)
-cuda_include_directories($ENV{COMANCHE_HOME}/src/lib/core/include)
 
 # build cuda code into static library
 

diff --git a/apps/paging-tracker/CMakeLists.txt b/apps/paging-tracker/CMakeLists.txt
@@ -1,13 +1,8 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../mk/common.cmake)
 
 project(paging-tracker CXX)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/components/)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib/common/include)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib/core/include)
 link_directories(/usr/local/lib)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 #link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)

diff --git a/src/components/allocator/block/CMakeLists.txt b/src/components/allocator/block/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/allocator/block/unit_test/CMakeLists.txt b/src/components/allocator/block/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(block-allocator-tests CXX)
 

diff --git a/src/components/api/wrappers/CMakeLists.txt b/src/components/api/wrappers/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(wrappers CXX)
 

diff --git a/src/components/block/nvme/CMakeLists.txt b/src/components/block/nvme/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5)
 
 add_subdirectory(./unit_test)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D_BSD_SOURCE -D_FILE_OFFSET_BITS=64 -MD -MP")

diff --git a/src/components/block/nvme/unit_test/CMakeLists.txt b/src/components/block/nvme/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(blocknvme-tests CXX)
 

diff --git a/src/components/block/posix/CMakeLists.txt b/src/components/block/posix/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
 add_subdirectory(./unit_test)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D_BSD_SOURCE -D_FILE_OFFSET_BITS=64 -MD -MP")
 set(DPDK_DIR "$ENV{COMANCHE_HOME}/deps/dpdk/")

diff --git a/src/components/block/posix/unit_test/CMakeLists.txt b/src/components/block/posix/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(blockposix-tests CXX)
 

diff --git a/src/components/block/raid/CMakeLists.txt b/src/components/block/raid/CMakeLists.txt
@@ -5,7 +5,6 @@ enable_language(CXX C ASM)
 
 add_subdirectory(./unit_test)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 include_directories(./src)
 

diff --git a/src/components/block/raid/unit_test/CMakeLists.txt b/src/components/block/raid/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(blockraid-tests CXX)
 

diff --git a/src/components/block/unvme/CMakeLists.txt b/src/components/block/unvme/CMakeLists.txt
@@ -5,7 +5,6 @@ enable_language(CXX C ASM)
 
 add_subdirectory(./unit_test)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 include_directories(./src)
 

diff --git a/src/components/block/unvme/unit_test/CMakeLists.txt b/src/components/block/unvme/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(blockunvme-tests CXX)
 

diff --git a/src/components/experimental/block-nvme-remote/CMakeLists.txt b/src/components/experimental/block-nvme-remote/CMakeLists.txt
@@ -40,7 +40,6 @@ include_directories(./src/lwip/src/include)
 include_directories(./src/lwip)
 include_directories(../)
 include_directories(../../components/api/)
-include_directories(../../lib/common/include)
 
 link_directories(../../lib/common)
 link_directories(../../../lib)

diff --git a/src/components/experimental/block-nvme-remote/unit_test/CMakeLists.txt b/src/components/experimental/block-nvme-remote/unit_test/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(../src/)
 include_directories(../../../../deps/spdk/include/)
 include_directories(../../../../deps/dpdk/include/dpdk/)
 include_directories(../../../components/api/)
-include_directories(../../../lib/common/include)
 link_directories(/usr/local/lib)
 link_directories(../../../lib/common)
 link_directories(../)

diff --git a/src/components/experimental/pmem-paged/CMakeLists.txt b/src/components/experimental/pmem-paged/CMakeLists.txt
@@ -7,9 +7,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 project(comanche-pmempaged CXX)
 
-include_directories(../../components/)
-include_directories(../../lib/common/include)
-include_directories(../../lib/core/include)
 link_directories(../../lib/common)
 link_directories(../../../lib)
 

diff --git a/src/components/experimental/pmem-paged/unit_test/CMakeLists.txt b/src/components/experimental/pmem-paged/unit_test/CMakeLists.txt
@@ -7,8 +7,6 @@ set(CXXMAKE_C_FLAGS "${CXXMAKE_C_FLAGS} -O2 -g")
 project(pmem-paged-tests CXX)
 
 include_directories(../../)
-include_directories(../../../components/api/)
-include_directories(../../../lib/common/include)
 link_directories(/usr/local/lib)
 link_directories(../../../lib/common)
 link_directories(../)

diff --git a/src/components/fs/minix/CMakeLists.txt b/src/components/fs/minix/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
 

diff --git a/src/components/fs/minix/unit_test/CMakeLists.txt b/src/components/fs/minix/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(fsminix-tests CXX)
 

diff --git a/src/components/metadata/fixobd/CMakeLists.txt b/src/components/metadata/fixobd/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 
@@ -14,5 +13,6 @@ add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 target_link_libraries(${PROJECT_NAME} common comanche-core pthread numa dl rt tbb)
+install(TARGETS ${PROJCT_NAME} LIBRARY DESTINATION lib)
 
 
diff --git a/src/components/metadata/fixobd/unit_test/CMakeLists.txt b/src/components/metadata/fixobd/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(fixobd-tests CXX)
 

diff --git a/src/components/net/rdma/CMakeLists.txt b/src/components/net/rdma/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/net/rdma/unit_test/CMakeLists.txt b/src/components/net/rdma/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(rdma-tests CXX)
 

diff --git a/src/components/partition/gpt/CMakeLists.txt b/src/components/partition/gpt/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/partition/gpt/unit_test/CMakeLists.txt b/src/components/partition/gpt/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(gptpart-tests CXX)
 

diff --git a/src/components/partition/region/CMakeLists.txt b/src/components/partition/region/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/partition/region/unit_test/CMakeLists.txt b/src/components/partition/region/unit_test/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
 project(regionpart-tests CXX)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 find_library(GTEST_LIB NAMES GTEST PATHS /usr/local/lib,/usr/lib)
 

diff --git a/src/components/pmem/fixed/CMakeLists.txt b/src/components/pmem/fixed/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/pmem/fixed/unit_test/CMakeLists.txt b/src/components/pmem/fixed/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(pmem-fixed-tests CXX)
 

diff --git a/src/components/pmem/paged/CMakeLists.txt b/src/components/pmem/paged/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/pmem/paged/unit_test/CMakeLists.txt b/src/components/pmem/paged/unit_test/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
 project(pmem-posix-tests CXX)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 find_library(GTEST_LIB NAMES GTEST PATHS /usr/local/lib,/usr/lib)
 

diff --git a/src/components/pmem/pager-simple/CMakeLists.txt b/src/components/pmem/pager-simple/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/pmem/pager-simple/unit_test/CMakeLists.txt b/src/components/pmem/pager-simple/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(regionpart-tests CXX)
 

diff --git a/src/components/sample/CMakeLists.txt b/src/components/sample/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 

diff --git a/src/components/sample/unit_test/CMakeLists.txt b/src/components/sample/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(sample-tests CXX)
 

diff --git a/src/components/store/append/CMakeLists.txt b/src/components/store/append/CMakeLists.txt
@@ -1,14 +1,11 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 
 project(comanche-storeappend CXX)
 
 include_directories($ENV{COMANCHE_HOME}/src/components/)
-include_directories($ENV{COMANCHE_HOME}/src/lib/common/include)
-include_directories($ENV{COMANCHE_HOME}/src/lib/core/include)
 link_directories($ENV{COMANCHE_HOME}/lib)
 
 add_definitions(${GCC_COVERAGE_COMPILE_FLAGS} -DCONFIG_DEBUG)

diff --git a/src/components/store/append/unit_test/CMakeLists.txt b/src/components/store/append/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(append-store-tests CXX)
 

diff --git a/src/components/store/blob/CMakeLists.txt b/src/components/store/blob/CMakeLists.txt
@@ -1,14 +1,10 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 
 project(comanche-blob CXX)
 
-include_directories(../../components/)
-include_directories(../../lib/common/include)
-include_directories(../../lib/core/include)
 link_directories(../../lib/common)
 link_directories(../../../lib)
 

diff --git a/src/components/store/blob/sqlite_ext/CMakeLists.txt b/src/components/store/blob/sqlite_ext/CMakeLists.txt
@@ -1,14 +1,11 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 #add_subdirectory(./unit_test)
 
 project(mddb C CXX)
 
 include_directories(../../components/)
-include_directories(../../lib/common/include)
-include_directories(../../lib/core/include)
 link_directories(../../lib/common)
 link_directories(../../../lib)
 

diff --git a/src/components/store/blob/unit_test/CMakeLists.txt b/src/components/store/blob/unit_test/CMakeLists.txt
@@ -1,12 +1,9 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(blob-tests CXX)
 
 include_directories(../../)
-include_directories(../../../components/api/)
-include_directories(../../../lib/common/include)
 link_directories(/usr/local/lib)
 link_directories(../../../lib/common)
 link_directories(../)

diff --git a/src/components/store/log/CMakeLists.txt b/src/components/store/log/CMakeLists.txt
@@ -1,14 +1,11 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 add_subdirectory(./unit_test)
 
 project(comanche-storelog CXX)
 
 include_directories($ENV{COMANCHE_HOME}/src/components/)
-include_directories($ENV{COMANCHE_HOME}/src/lib/common/include)
-include_directories($ENV{COMANCHE_HOME}/src/lib/core/include)
 link_directories($ENV{COMANCHE_HOME}/lib)
 
 add_definitions(${GCC_COVERAGE_COMPILE_FLAGS} -DCONFIG_DEBUG)

diff --git a/src/components/store/log/unit_test/CMakeLists.txt b/src/components/store/log/unit_test/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(log-store-tests CXX)
 

diff --git a/src/fuse/append/CMakeLists.txt b/src/fuse/append/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required (VERSION 3.5.1 FATAL_ERROR)
 
-include($ENV{COMANCHE_HOME}/mk/common.cmake)
 
 project(fuse-append CXX)