Commit fbeda96a authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch 'amiranda/164-define-a-convenience-library-for-path_util' into 'master' 

Resolve "Define a convenience library for `path_util`"

Closes #164

See merge request !102
parents ec3aa8ab ce9a758f

src/client/CMakeLists.txt

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ set(PRELOAD_SRC 
    preload.cpp

    preload_context.cpp

    preload_util.cpp

    ../common/path_util.cpp

    ../common/rpc/rpc_util.cpp

    rpc/rpc_types.cpp

    rpc/forward_data.cpp
@@ -72,7 +71,6 @@ set(PRELOAD_HEADERS 
    ../../include/client/syscalls/detail/syscall_info.h

    ../../include/common/cmake_configure.hpp

    ../../include/common/common_defs.hpp

    ../../include/common/path_util.hpp

    ../../include/common/rpc/rpc_types.hpp

    ../../include/common/rpc/rpc_util.hpp

    )
@@ -81,6 +79,8 @@ set(PRELOAD_LINK_LIBRARIES 
    metadata

    distributor

    env_util

    arithmetic

    path_util

    # external

    Syscall_intercept::Syscall_intercept

    dl
@@ -100,7 +100,6 @@ add_library(gkfs_intercept SHARED ${PRELOAD_SRC} ${PRELOAD_HEADERS}) 


target_link_libraries(gkfs_intercept

  PRIVATE

    arithmetic

    ${PRELOAD_LINK_LIBRARIES})



target_include_directories(gkfs_intercept PRIVATE ${PRELOAD_INCLUDE_DIRS})

src/common/CMakeLists.txt

+12 −0
Original line number Diff line number Diff line
@@ -89,3 +89,15 @@ target_link_libraries(metadata 
if(GKFS_ENABLE_CODE_COVERAGE)

  target_code_coverage(metadata AUTO)

endif()



add_library(path_util

  STATIC

  )

set_property(TARGET metadata PROPERTY POSITION_INDEPENDENT_CODE ON)



target_sources(path_util

  PRIVATE

    path_util.cpp

  PUBLIC

    ${INCLUDE_DIR}/common/path_util.hpp

  )

src/daemon/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ add_subdirectory(backend) 


set(DAEMON_SRC

    ../common/rpc/rpc_util.cpp

    ../common/path_util.cpp

    daemon.cpp

    util.cpp

    ops/metadentry.cpp
@@ -48,7 +47,6 @@ set(DAEMON_HEADERS 
    ../../include/common/common_defs.hpp

    ../../include/common/rpc/rpc_types.hpp

    ../../include/common/rpc/rpc_util.hpp

    ../../include/common/path_util.hpp

    ../../include/daemon/daemon.hpp

    ../../include/daemon/util.hpp

    ../../include/daemon/ops/data.hpp
@@ -68,6 +66,7 @@ set(DAEMON_LINK_LIBRARIES 
    env_util

    spdlog

    fmt::fmt

    path_util

    # margo libs

    ${ABT_LIBRARIES}

    mercury

src/daemon/backend/data/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ target_sources(storage 
    PUBLIC

    ${INCLUDE_DIR}/daemon/backend/data/chunk_storage.hpp

    PRIVATE

    ${INCLUDE_DIR}/common/path_util.hpp

    ${INCLUDE_DIR}/common/common_defs.hpp

    ${INCLUDE_DIR}/daemon/backend/data/file_handle.hpp

    ${CMAKE_CURRENT_LIST_DIR}/chunk_storage.cpp
@@ -58,6 +57,7 @@ target_link_libraries(storage 
    PRIVATE

    spdlog

    data_module

    path_util

    # open issue for std::filesystem https://gitlab.kitware.com/cmake/cmake/-/issues/17834

    stdc++fs

    -ldl

src/daemon/backend/metadata/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ target_sources(metadata_db 
    ${INCLUDE_DIR}/daemon/backend/metadata/db.hpp

    ${INCLUDE_DIR}/daemon/backend/exceptions.hpp

    PRIVATE

    ${INCLUDE_DIR}/common/path_util.hpp

    ${INCLUDE_DIR}/daemon/backend/metadata/merge.hpp

    ${CMAKE_CURRENT_LIST_DIR}/merge.cpp

    ${CMAKE_CURRENT_LIST_DIR}/db.cpp
@@ -62,4 +61,5 @@ target_link_libraries(metadata_db 
    metadata

    RocksDB

    spdlog

    path_util

    )