Verified Commit 8a3b5cb3 authored by Marc Vef's avatar Marc Vef
Browse files

Streamlining CMakeFiles

parent 8d6824a8

src/client/CMakeLists.txt

+53 −64
Original line number Diff line number Diff line
@@ -26,55 +26,55 @@ 
#                                                                              #

# SPDX-License-Identifier: LGPL-3.0-or-later                                   #

################################################################################



set(PRELOAD_SRC

    gkfs_functions.cpp

    hooks.cpp

    intercept.cpp

    logging.cpp

    open_file_map.cpp

    open_dir.cpp

    path.cpp

    preload.cpp

    preload_context.cpp

    preload_util.cpp

    ../common/rpc/rpc_util.cpp

    rpc/rpc_types.cpp

    rpc/forward_data.cpp

    rpc/forward_management.cpp

    rpc/forward_metadata.cpp

    syscalls/detail/syscall_info.c

    )

set(PRELOAD_HEADERS

    ../../include/client/gkfs_functions.hpp

    ../../include/config.hpp

    ../../include/client/env.hpp

    ../../include/client/hooks.hpp

    ../../include/client/intercept.hpp

    ../../include/client/logging.hpp

    ../../include/client/make_array.hpp

    ../../include/client/open_file_map.hpp

    ../../include/client/open_dir.hpp

    ../../include/client/path.hpp

    ../../include/client/preload.hpp

    ../../include/client/preload_context.hpp

    ../../include/client/preload_util.hpp

    ../../include/client/rpc/rpc_types.hpp

    ../../include/client/rpc/forward_management.hpp

    ../../include/client/rpc/forward_metadata.hpp

    ../../include/client/rpc/forward_data.hpp

    ../../include/client/syscalls/args.hpp

    ../../include/client/syscalls/decoder.hpp

    ../../include/client/syscalls/errno.hpp

    ../../include/client/syscalls/rets.hpp

    ../../include/client/syscalls/syscall.hpp

    ../../include/client/syscalls/detail/syscall_info.h

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

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

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

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

set(PRELOAD_SOURCES

    PRIVATE

    ${CMAKE_CURRENT_LIST_DIR}/gkfs_functions.cpp

    ${CMAKE_CURRENT_LIST_DIR}/hooks.cpp

    ${CMAKE_CURRENT_LIST_DIR}/intercept.cpp

    ${CMAKE_CURRENT_LIST_DIR}/logging.cpp

    ${CMAKE_CURRENT_LIST_DIR}/open_file_map.cpp

    ${CMAKE_CURRENT_LIST_DIR}/open_dir.cpp

    ${CMAKE_CURRENT_LIST_DIR}/path.cpp

    ${CMAKE_CURRENT_LIST_DIR}/preload.cpp

    ${CMAKE_CURRENT_LIST_DIR}/preload_context.cpp

    ${CMAKE_CURRENT_LIST_DIR}/preload_util.cpp

    ${CMAKE_CURRENT_LIST_DIR}/../common/rpc/rpc_util.cpp

    ${CMAKE_CURRENT_LIST_DIR}/rpc/rpc_types.cpp

    ${CMAKE_CURRENT_LIST_DIR}/rpc/forward_data.cpp

    ${CMAKE_CURRENT_LIST_DIR}/rpc/forward_management.cpp

    ${CMAKE_CURRENT_LIST_DIR}/rpc/forward_metadata.cpp

    ${CMAKE_CURRENT_LIST_DIR}/syscalls/detail/syscall_info.c

    PUBLIC

    ${INCLUDE_DIR}/client/gkfs_functions.hpp

    ${INCLUDE_DIR}/config.hpp

    ${INCLUDE_DIR}/client/env.hpp

    ${INCLUDE_DIR}/client/hooks.hpp

    ${INCLUDE_DIR}/client/intercept.hpp

    ${INCLUDE_DIR}/client/logging.hpp

    ${INCLUDE_DIR}/client/make_array.hpp

    ${INCLUDE_DIR}/client/open_file_map.hpp

    ${INCLUDE_DIR}/client/open_dir.hpp

    ${INCLUDE_DIR}/client/path.hpp

    ${INCLUDE_DIR}/client/preload.hpp

    ${INCLUDE_DIR}/client/preload_context.hpp

    ${INCLUDE_DIR}/client/preload_util.hpp

    ${INCLUDE_DIR}/client/rpc/rpc_types.hpp

    ${INCLUDE_DIR}/client/rpc/forward_management.hpp

    ${INCLUDE_DIR}/client/rpc/forward_metadata.hpp

    ${INCLUDE_DIR}/client/rpc/forward_data.hpp

    ${INCLUDE_DIR}/client/syscalls/args.hpp

    ${INCLUDE_DIR}/client/syscalls/decoder.hpp

    ${INCLUDE_DIR}/client/syscalls/errno.hpp

    ${INCLUDE_DIR}/client/syscalls/rets.hpp

    ${INCLUDE_DIR}/client/syscalls/syscall.hpp

    ${INCLUDE_DIR}/client/syscalls/detail/syscall_info.h

    ${INCLUDE_DIR}/common/cmake_configure.hpp.in

    ${INCLUDE_DIR}/common/common_defs.hpp

    ${INCLUDE_DIR}/common/rpc/rpc_types.hpp

    ${INCLUDE_DIR}/common/rpc/rpc_util.hpp

    )

set(PRELOAD_LINK_LIBRARIES

    PRIVATE

    # internal

    metadata

    distributor
@@ -91,23 +91,20 @@ set(PRELOAD_LINK_LIBRARIES 
    Date::TZ

    )

set(PRELOAD_INCLUDE_DIRS

    PRIVATE

    ${ABT_INCLUDE_DIRS}

    ${MARGO_INCLUDE_DIRS}

    )



add_library(gkfs_intercept SHARED ${PRELOAD_SRC} ${PRELOAD_HEADERS})



target_link_libraries(gkfs_intercept

  PRIVATE

    ${PRELOAD_LINK_LIBRARIES})



add_library(gkfs_intercept SHARED)

target_sources(gkfs_intercept ${PRELOAD_SOURCES})

target_link_libraries(gkfs_intercept PRIVATE ${PRELOAD_LINK_LIBRARIES})

target_include_directories(gkfs_intercept PRIVATE ${PRELOAD_INCLUDE_DIRS})



if(GKFS_ENABLE_CODE_COVERAGE)

  target_code_coverage(gkfs_intercept AUTO)

endif()





install(TARGETS gkfs_intercept

    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -115,15 +112,8 @@ install(TARGETS gkfs_intercept 
    )

################### Forwarding client ###################

if (GKFS_ENABLE_FORWARDING)

    set(FWD_PRELOAD_SRC

        ${PRELOAD_SRC}

        )

    set(FWD_PRELOAD_HEADERS

        ${PRELOAD_HEADERS}

        )



    add_library(gkfwd_intercept SHARED ${FWD_PRELOAD_SRC} ${FWD_PRELOAD_HEADERS})



    add_library(gkfwd_intercept SHARED)

    target_sources(gkfwd_intercept ${PRELOAD_SOURCES})

    if (GKFS_ENABLE_AGIOS)

        target_compile_definitions(gkfwd_daemon

            PUBLIC
@@ -141,7 +131,6 @@ if (GKFS_ENABLE_FORWARDING) 
    message(STATUS "[gekkofs] AGIOS scheduling: ${GKFS_ENABLE_AGIOS}")



    target_link_libraries(gkfwd_intercept PRIVATE ${PRELOAD_LINK_LIBRARIES})



    target_include_directories(gkfwd_intercept PRIVATE ${PRELOAD_INCLUDE_DIRS})



    if(GKFS_ENABLE_CODE_COVERAGE)

src/daemon/CMakeLists.txt

+43 −50
Original line number Diff line number Diff line
@@ -28,35 +28,36 @@ 


add_subdirectory(backend)



set(DAEMON_SRC

    ../common/rpc/rpc_util.cpp

    daemon.cpp

    util.cpp

    ops/metadentry.cpp

    ops/data.cpp

    classes/fs_data.cpp

    classes/rpc_data.cpp

    handler/srv_data.cpp

    handler/srv_metadata.cpp

    handler/srv_management.cpp

    )

set(DAEMON_HEADERS

    ../../include/config.hpp

    ../../include/version.hpp.in

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

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

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

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

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

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

    ../../include/daemon/ops/data.hpp

    ../../include/daemon/ops/metadentry.hpp

    ../../include/daemon/classes/fs_data.hpp

    ../../include/daemon/classes/rpc_data.hpp

    ../../include/daemon/handler/rpc_defs.hpp

    ../../include/daemon/handler/rpc_util.hpp

set(DAEMON_SOURCES

    PRIVATE

    ${CMAKE_CURRENT_LIST_DIR}/../common/rpc/rpc_util.cpp

    ${CMAKE_CURRENT_LIST_DIR}/daemon.cpp

    ${CMAKE_CURRENT_LIST_DIR}/util.cpp

    ${CMAKE_CURRENT_LIST_DIR}/ops/metadentry.cpp

    ${CMAKE_CURRENT_LIST_DIR}/ops/data.cpp

    ${CMAKE_CURRENT_LIST_DIR}/classes/fs_data.cpp

    ${CMAKE_CURRENT_LIST_DIR}/classes/rpc_data.cpp

    ${CMAKE_CURRENT_LIST_DIR}/handler/srv_data.cpp

    ${CMAKE_CURRENT_LIST_DIR}/handler/srv_metadata.cpp

    ${CMAKE_CURRENT_LIST_DIR}/handler/srv_management.cpp

    PUBLIC

    ${INCLUDE_DIR}/config.hpp

    ${INCLUDE_DIR}/version.hpp.in

    ${INCLUDE_DIR}/common/cmake_configure.hpp.in

    ${INCLUDE_DIR}/common/common_defs.hpp

    ${INCLUDE_DIR}/common/rpc/rpc_types.hpp

    ${INCLUDE_DIR}/common/rpc/rpc_util.hpp

    ${INCLUDE_DIR}/daemon/daemon.hpp

    ${INCLUDE_DIR}/daemon/util.hpp

    ${INCLUDE_DIR}/daemon/ops/data.hpp

    ${INCLUDE_DIR}/daemon/ops/metadentry.hpp

    ${INCLUDE_DIR}/daemon/classes/fs_data.hpp

    ${INCLUDE_DIR}/daemon/classes/rpc_data.hpp

    ${INCLUDE_DIR}/daemon/handler/rpc_defs.hpp

    ${INCLUDE_DIR}/daemon/handler/rpc_util.hpp

    )

set(DAEMON_LINK_LIBRARIES

    PRIVATE

    # internal libs

    metadata

    metadata_db
@@ -76,14 +77,15 @@ set(DAEMON_LINK_LIBRARIES 
    Threads::Threads

    )

set(DAEMON_INCLUDE_DIRS

    PRIVATE

    ${ABT_INCLUDE_DIRS}

    ${MARGO_INCLUDE_DIRS}

    )



add_executable(gkfs_daemon ${DAEMON_SRC} ${DAEMON_HEADERS})

target_link_libraries(gkfs_daemon PRIVATE ${DAEMON_LINK_LIBRARIES})



target_include_directories(gkfs_daemon PRIVATE ${DAEMON_INCLUDE_DIRS})

add_executable(gkfs_daemon)

target_sources(gkfs_daemon ${DAEMON_SOURCES})

target_link_libraries(gkfs_daemon ${DAEMON_LINK_LIBRARIES})

target_include_directories(gkfs_daemon ${DAEMON_INCLUDE_DIRS})



if(GKFS_ENABLE_CODE_COVERAGE)

  target_code_coverage(gkfs_daemon AUTO)
@@ -95,30 +97,22 @@ install(TARGETS gkfs_daemon 
################### Forwarding daemon ###################

if (GKFS_ENABLE_FORWARDING)

    if (GKFS_ENABLE_AGIOS)

        set(FWD_DAEMON_SRC

            ${DAEMON_SRC}

            scheduler/agios.cpp

            )

        set(FWD_DAEMON_HEADERS

            ${DAEMON_HEADERS}

            ../../include/daemon/scheduler/agios.hpp

        set(FWD_DAEMON_SOURCES

            PRIVATE

            ${CMAKE_CURRENT_LIST_DIR}/scheduler/agios.cpp

            PUBLIC

            ${INCLUDE_DIR}/daemon/scheduler/agios.hpp

            )

        add_executable(gkfwd_daemon ${FWD_DAEMON_SRC} ${FWD_DAEMON_HEADERS})



        add_executable(gkfwd_daemon)

        target_sources(gkfwd_daemon ${DAEMON_SOURCES} ${FWD_DAEMON_SOURCES})

        target_compile_definitions(gkfwd_daemon

            PUBLIC

            GKFS_ENABLE_FORWARDING

            GKFS_ENABLE_AGIOS

            )

    else ()

        set(FWD_DAEMON_SRC

            ${DAEMON_SRC}

            )

        set(FWD_DAEMON_HEADERS

            ${DAEMON_HEADERS}

            )

        add_executable(gkfwd_daemon ${FWD_DAEMON_SRC} ${FWD_DAEMON_HEADERS})



        add_executable(gkfwd_daemon)

        target_sources(gkfwd_daemon ${DAEMON_SOURCES})

        target_compile_definitions(gkfwd_daemon

            PUBLIC

            GKFS_ENABLE_FORWARDING
@@ -133,7 +127,6 @@ if (GKFS_ENABLE_FORWARDING) 
        ${DAEMON_LINK_LIBRARIES}

        ${AGIOS_LIBRARIES}

        )



    target_include_directories(gkfwd_daemon

        PRIVATE

        ${DAEMON_INCLUDE_DIRS}