Verified Commit a4395a75 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Drop ADAFS_DEPS_INSTALL cmake custom variable 

Instead of using custom variable to search for installed libraries
we can rely on the standard `CMAKE_PREFIX_PATH` [1]

[1]: https://cmake.org/cmake/help/v3.8/variable/CMAKE_PREFIX_PATH.html#variable:CMAKE_PREFIX_PATH
parent 3610f2ec

ifs/CMake/FindAbt-IO.cmake

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
find_path(ABT_IO_DIR

    HINTS

    /usr

    /usr/local

    /usr/local/adafs/

    ${ADAFS_DEPS_INSTALL}

    )



find_path(ABT_IO_INCLUDE_DIR abt-io.h

    HINTS

    ${ABT_IO_DIR}

    ${ADAFS_DEPS_INSTALL}

    /usr

    /usr/local

    /usr/local/adafs

    /opt

    PATH_SUFFIXES include

    PATH_SUFFIXES include/abt-io

    )



find_library(ABT_IO_LIBRARY abt-io

    HINTS

    ${ABT_IO_DIR}

    ${ADAFS_DEPS_INSTALL}

    /usr

    /usr/local

    /usr/local/adafs

    /opt/

    PATH_SUFFIXES lib

    PATH_SUFFIXES lib/abt-io

    )



set(ABT_IO_INCLUDE_DIRS ${ABT_IO_INCLUDE_DIR})

set(ABT_IO_LIBRARIES ${ABT_IO_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(Abt-IO DEFAULT_MSG ABT_IO_LIBRARY ABT_IO_INCLUDE_DIR)



mark_as_advanced(

    ABT_IO_DIR

    ABT_IO_LIBRARY

    ABT_IO_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindAbt.cmake

+7 −35
Original line number Diff line number Diff line 
find_path(ABT_DIR

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

find_path(ABT_INCLUDE_DIR

    NAMES abt.h

)



find_path(ABT_INCLUDE_DIR abt.h

        HINTS

        ${ADAFS_DEPS_INSTALL}

        $ENV{HOME}/opt

        ${ABT_DIR}

        /usr

        /usr/local

        /usr/local/adafs

        /opt

        PATH_SUFFIXES include

        PATH_SUFFIXES include/argobots

        )



find_library(ABT_LIBRARY abt

        HINTS

        ${ADAFS_DEPS_INSTALL}

        $ENV{HOME}/opt

        ${ABT_DIR}

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/argobots

find_library(ABT_LIBRARY

    NAMES abt

)



set(ABT_INCLUDE_DIRS ${ABT_INCLUDE_DIR})

set(ABT_LIBRARIES ${ABT_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(Abt DEFAULT_MSG ABT_LIBRARY ABT_INCLUDE_DIR)

find_package_handle_standard_args(Abt DEFAULT_MSG ABT_LIBRARIES ABT_INCLUDE_DIRS)



mark_as_advanced(

        ABT_DIR

        ABT_LIBRARY

        ABT_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindBMI.cmake

+6 −33
Original line number Diff line number Diff line 
find_path(BMI_DIR

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

find_path(BMI_INCLUDE_DIR

    NAMES bmi.h

)



find_path(BMI_INCLUDE_DIR bmi.h

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${BMI_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt

        PATH_SUFFIXES include

        PATH_SUFFIXES include/bmi

        )



find_library(BMI_LIBRARY bmi

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${BMI_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/bmi

find_library(BMI_LIBRARY

    NAMES bmi

)



set(BMI_INCLUDE_DIRS ${BMI_INCLUDE_DIR})
@@ -40,7 +14,6 @@ include(FindPackageHandleStandardArgs) 
find_package_handle_standard_args(BMI DEFAULT_MSG BMI_LIBRARY BMI_INCLUDE_DIR)



mark_as_advanced(

        BMI_DIR

        BMI_LIBRARY

        BMI_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindCCI.cmake

+6 −33
Original line number Diff line number Diff line 
find_path(CCI_DIR

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

find_path(CCI_INCLUDE_DIR

    NAMES cci.h

)



find_path(CCI_INCLUDE_DIR cci.h

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${CCI_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt

        PATH_SUFFIXES include

        PATH_SUFFIXES include/cci

        )



find_library(CCI_LIBRARY cci

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${CCI_DIR}

        $ENV{HOME}/opt

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/cci

find_library(CCI_LIBRARY

    NAMES cci

)



set(CCI_INCLUDE_DIRS ${CCI_INCLUDE_DIR})
@@ -40,7 +14,6 @@ include(FindPackageHandleStandardArgs) 
find_package_handle_standard_args(CCI DEFAULT_MSG CCI_LIBRARY CCI_INCLUDE_DIR)



mark_as_advanced(

        CCI_DIR

        CCI_LIBRARY

        CCI_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindJeMalloc.cmake

+0 −5
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#  JEMALLOC_LIBRARIES         The jemalloc library/libraries

#  JEMALLOC_INCLUDE_DIR       The location of jemalloc headers



find_path(JEMALLOC_ROOT_DIR

    NAMES include/jemalloc/jemalloc.h

    )



find_library(JEMALLOC_LIBRARY

    NAMES jemalloc

    HINTS ${JEMALLOC_ROOT_DIR}/lib
@@ -38,7 +34,6 @@ find_package_handle_standard_args(JeMalloc DEFAULT_MSG 
    )



mark_as_advanced(

    JEMALLOC_ROOT_DIR

    JEMALLOC_LIBRARY

    JEMALLOC_INCLUDE_DIR

)