Verified Commit 5fd8d18e authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

cmake: use mercury exported target 

Avoid the usage of a custom cmake "find-module" for mercury.
Instead use the official exported target
parent 1a7b77b6

ifs/CMake/FindMercury.cmake

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
find_path(MERCURY_DIR

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

        )



find_path(MERCURY_INCLUDE_DIR mercury.h

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${MERCURY_DIR}

        /usr

        /usr/local

        /usr/local/adafs

        /opt

        PATH_SUFFIXES include

        PATH_SUFFIXES include/mercury

        )



find_library(MERCURY_LIBRARY

        NAMES mercury mercury_debug

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${MERCURY_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/mercury

        )



set(MERCURY_INCLUDE_DIRS ${MERCURY_INCLUDE_DIR})

set(MERCURY_LIBRARIES ${MERCURY_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(Mercury DEFAULT_MSG MERCURY_LIBRARY MERCURY_INCLUDE_DIR)



mark_as_advanced(

        MERCURY_DIR

        MERCURY_LIBRARY

        MERCURY_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindMercuryUtil.cmake

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
find_path(MERCURY_UTIL_DIR

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

        )



find_library(MERCURY_UTIL_LIBRARY

        NAMES mercury_util mercury_util_debug

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${MERCURY_UTIL_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/mercury_util

        )



set(MERCURY_UTIL_LIBRARIES ${MERCURY_UTIL_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(Mercury_Util DEFAULT_MSG MERCURY_UTIL_LIBRARY)



mark_as_advanced(

        MERCURY_UTIL_DIR

        MERCURY_UTIL_LIBRARY

        MERCURY_UTIL_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ find_package(RocksDB REQUIRED) 
# margo dependencies

find_package(Libev REQUIRED)

find_package(Mercury REQUIRED)

find_package(MercuryUtil REQUIRED)

find_package(Abt REQUIRED)

find_package(Abt-Snoozer REQUIRED)

find_package(Margo REQUIRED)

ifs/src/daemon/CMakeLists.txt

+1 −4
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ target_link_libraries(adafs_daemon 
    # margo libs

    ${ABT_LIBRARIES}

    ${ABT_SNOOZER_LIBRARIES}

    ${NA_LIB}

    ${MERCURY_LIBRARIES}

    ${MERCURY_UTIL_LIBRARIES}

    mercury

    ${MARGO_LIBRARIES}

    Boost::program_options

    Boost::filesystem
@@ -53,6 +51,5 @@ target_include_directories(adafs_daemon 
    ${ABT_INCLUDE_DIRS}

    ${ABT_SNOOZER_INCLUDE_DIRS}

    ${LIBEV_INCLUDE_DIRS}

    ${MERCURY_INCLUDE_DIRS}

    ${MARGO_INCLUDE_DIRS}

    )

ifs/src/preload/CMakeLists.txt

+1 −4
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ target_link_libraries(adafs_preload_client 
    dl

    ${ABT_LIBRARIES}

    ${ABT_SNOOZER_LIBRARIES}

    ${NA_LIB}

    ${MERCURY_LIBRARIES}

    ${MERCURY_UTIL_LIBRARIES}

    mercury

    ${MARGO_LIBRARIES}

    Threads::Threads

)
@@ -55,6 +53,5 @@ target_include_directories(adafs_preload_client 
    ${ABT_INCLUDE_DIRS}

    ${ABT_SNOOZER_INCLUDE_DIRS}

    ${LIBEV_INCLUDE_DIRS}

    ${MERCURY_INCLUDE_DIRS}

    ${MARGO_INCLUDE_DIRS}

    )