Commit bb5f7665 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'boost_target' into 'master' 

Use CMake imported target for Boost components

See merge request zdvresearch_bsc/adafs!68
parents 8f65b83b 0b6e2f3c

ifs/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -56,7 +56,11 @@ find_package(Abt-Snoozer REQUIRED) 
find_package(Margo REQUIRED)



# boost dependencies, system is required for filesystem

find_package(Boost 1.53 REQUIRED COMPONENTS system filesystem program_options)

find_package(Boost 1.53 REQUIRED

    COMPONENTS

    filesystem

    program_options

    )



find_package(Threads REQUIRED)

ifs/src/daemon/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ target_link_libraries(adafs_daemon 
    ${MERCURY_LIBRARIES}

    ${MERCURY_UTIL_LIBRARIES}

    ${MARGO_LIBRARIES}

    ${Boost_LIBRARIES}

    Boost::program_options

    Boost::filesystem

    ${JEMALLOC_LIBRARIES}

    Threads::Threads

    )

ifs/src/preload/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ target_link_libraries(adafs_preload_client 
    ${MERCURY_LIBRARIES}

    ${MERCURY_UTIL_LIBRARIES}

    ${MARGO_LIBRARIES}

    ${Boost_LIBRARIES}

    Threads::Threads

)