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

Merge branch 'jmalloc_fix' into 'master' 



Cmake fixes

See merge request zdvresearch_bsc/adafs!53

Signed-off-by: default avatarMarc Vef <vef@uni-mainz.de>
parents 80a35953 69626987

ifs/CMake/FindGFlags.cmake

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

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

        )



find_path(GFlags_INCLUDE_DIR gflags.h

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${GFlags_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt

        PATH_SUFFIXES include

        PATH_SUFFIXES include/gflags

        )



find_library(GFlags_LIBRARY gflags

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${GFlags_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/gflags

        )



set(GFlags_INCLUDE_DIRS ${GFlags_INCLUDE_DIR})

set(GFlags_LIBRARIES ${GFlags_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(GFlags DEFAULT_MSG GFlags_LIBRARY GFlags_INCLUDE_DIR)



mark_as_advanced(

        GFlags_DIR

        GFlags_LIBRARY

        GFlags_INCLUDE_DIR

)

ifs/CMake/FindJeMalloc.cmake

+7 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ find_path(JEMALLOC_ROOT_DIR 
    NAMES include/jemalloc/jemalloc.h

    )



find_library(JEMALLOC_LIBRARIES

find_library(JEMALLOC_LIBRARY

    NAMES jemalloc

    HINTS ${JEMALLOC_ROOT_DIR}/lib

    )
@@ -33,12 +33,15 @@ find_path(JEMALLOC_INCLUDE_DIR 


include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(JeMalloc DEFAULT_MSG

    JEMALLOC_LIBRARIES

    JEMALLOC_LIBRARY

    JEMALLOC_INCLUDE_DIR

    )



mark_as_advanced(

    JEMALLOC_ROOT_DIR

    JEMALLOC_LIBRARIES

    JEMALLOC_LIBRARY

    JEMALLOC_INCLUDE_DIR

)



set(JMALLOC_LIBRARIES ${JMALLOC_LIBRARY})

set(JMALLOC_INCLUDE_DIRS ${JMALLOC_INCLUDE_DIR})
 
 No newline at end of file

ifs/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ endif (NOT ADAFS_DEPS_INSTALL) 
find_package(LZ4 REQUIRED)

find_package(ZLIB REQUIRED)

find_package(BZip2 REQUIRED)

find_package(GFlags REQUIRED)

find_package(snappy REQUIRED)

find_package(ZStd REQUIRED)

find_package(JeMalloc) # required if rocksdb has been build with jemalloc

ifs/src/daemon/CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ target_link_libraries(adafs_daemon 
    ${MERCURY_UTIL_LIBRARIES}

    ${MARGO_LIBRARIES}

    ${Boost_LIBRARIES}

    ${JEMALLOC_LIBRARIES}

    Threads::Threads

    )
 
if (${JEMALLOC_FOUND})

    target_link_libraries(adafs_daemon ${JEMALLOC_LIBRARIES})

endif ()