Unverified Commit 29933f61 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

cmake: do not specify headers explicitely 

since we use the `include_directories(include)` it is not necessary to
explitely specify all the headers file in the source list.
parent 4bf6860f

ifs/CMakeLists.txt

+19 −19
Original line number Diff line number Diff line
@@ -115,25 +115,25 @@ include_directories(include ${ROCKSDB_INCLUDE_DIR} 


include_directories(include)

add_subdirectory(src/preload)

#add_subdirectory(src/fuse3)



set(SOURCE_FILES main.cpp main.hpp include/configure.hpp configure_public.hpp util.cpp

        src/db/db_util.cpp src/classes/fs_data.cpp src/classes/rpc_data.cpp



        include/db/db_util.hpp include/classes/fs_data.hpp include/classes/rpc_data.hpp

        include/classes/metadata.hpp src/classes/metadata.cpp

        src/daemon/adafs_daemon.cpp include/daemon/adafs_daemon.hpp



        include/rpc/rpc_defs.hpp include/rpc/rpc_types.hpp



        #src/daemon/fs_operations.cpp include/daemon/fs_operations.hpp

set(DAEMON_SRC

    main.cpp

    util.cpp

    src/daemon/adafs_daemon.cpp

    src/db/db_util.cpp

    src/db/db_ops.cpp

    src/classes/fs_data.cpp

    src/classes/rpc_data.cpp

    src/classes/metadata.cpp

    src/adafs_ops/data.cpp

    src/adafs_ops/metadentry.cpp

        include/adafs_ops/metadentry.hpp src/db/db_ops.cpp src/db/db_ops.cpp include/db/db_ops.hpp

    src/rpc/handler/h_metadentry.cpp

        src/adafs_ops/data.cpp include/adafs_ops/data.hpp src/rpc/handler/h_data.cpp

    src/rpc/handler/h_data.cpp

    src/rpc/handler/h_preload.cpp

        include/rpc/rpc_utils.hpp src/rpc/rpc_utils.cpp include/global_defs.hpp)

add_executable(adafs_daemon ${SOURCE_FILES})

    src/rpc/rpc_utils.cpp

)



add_executable(adafs_daemon ${DAEMON_SRC})



if (${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")

    target_link_libraries(adafs_daemon ${ROCKSDB_LIBRARIES}

ifs/src/preload/CMakeLists.txt

+13 −7
Original line number Diff line number Diff line
@@ -10,15 +10,21 @@ set(CMAKE_CXX_FLAGS_MEMCHECK "-Wall --pedantic -g -O0 -fsanitize=address -fno-om 
set(CMAKE_CXX_FLAGS_MAINTAINER "-Wall --pedantic -g -O0 -pg -no-pie -fPIC") # -no-pie to be tested with gprof

message("* Current library build type is : ${CMAKE_BUILD_TYPE}")



set(SOURCE_FILES_PRELOAD preload.cpp ../../include/configure.hpp ../../configure_public.hpp

        open_file_map.cpp ../../include/preload/preload.hpp

        ../../include/preload/open_file_map.hpp preload_util.cpp ../../include/preload/preload_util.hpp

set(PRELOAD_SOURCES

    preload.cpp

    open_file_map.cpp

    preload_util.cpp

    margo_ipc.cpp

    intcp_functions.cpp

    passthrough.cpp

    adafs_functions.cpp

    rpc/ld_rpc_data_ws.cpp

    rpc/ld_rpc_metadentry.cpp

    ../rpc/rpc_utils.cpp

)



        ../../include/preload/ipc_types.hpp margo_ipc.cpp ../../include/preload/margo_ipc.hpp

add_library(iointer SHARED ${PRELOAD_SOURCES})



        rpc/ld_rpc_data_ws.cpp rpc/ld_rpc_metadentry.cpp ../../include/preload/rpc/ld_rpc_data_ws.hpp ../../include/preload/rpc/ld_rpc_metadentry.hpp

        ../../include/rpc/rpc_utils.hpp ../rpc/rpc_utils.cpp intcp_functions.cpp passthrough.cpp ../../include/preload/passthrough.hpp ../../include/global_defs.hpp adafs_functions.cpp adafs_functions.cpp ../../include/preload/adafs_functions.hpp)

add_library(iointer SHARED ${SOURCE_FILES_PRELOAD})

if (${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")

    target_link_libraries(iointer dl ${NA_LIB} ${MERCURY_LIBRARIES} ${MERCURY_UTIL_LIBRARIES} ${ABT_LIBRARIES}

            ${ABT_SNOOZER_LIBRARIES} ${MARGO_LIBRARIES}