Commit 24a72b30 authored by EVPath Upstream's avatar EVPath Upstream Committed by Atkins, Charles Vernon
Browse files

EVPath 2018-03-28 (5a969f1c) 

Code extracted from:

    https://github.com/GTkorvo/EVPath.git

at commit 5a969f1cc108b552352d9cd76c56757c87042d93 (master).

Upstream Shortlog
-----------------

Chuck Atkins (2):
      14663971 Use upstream fixes to support static pkg-config targets
      7d9d4be0 Bump cmake_minimum_required to 3.2
parent d1ef913c

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.0.0)

cmake_minimum_required(VERSION 3.2)

project(EVPath VERSION 4.3.1 LANGUAGES C)



if(POLICY CMP0074)

  cmake_policy(SET CMP0074 NEW)

endif()



# Some boilerplate to setup nice output directories

set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory")

set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Installation library subdirectory")

cmake/FindLIBFABRIC.cmake

+26 −12
Original line number Diff line number Diff line
@@ -8,29 +8,43 @@ 
######################################################

set(LIBFABRIC_PREFIX "" CACHE STRING "Help cmake to find libfabric library (https://github.com/ofiwg/libfabric) into your system.")

mark_as_advanced(LIBFABRIC_PREFIX)

if(NOT LIBFABRIC_PREFIX)

  set(LIBFABRIC_PREFIX ${LIBFABRIC_ROOT})

endif()

if(NOT LIBFABRIC_PREFIX)

  set(LIBFABRIC_PREFIX $ENV{LIBFABRIC_ROOT})

if(NOT LIBFABRIC_ROOT AND "$ENV{LIBFABRIC_ROOT}" STREQUAL "")

  set(LIBFABRIC_ROOT ${LIBFABRIC_PREFIX})

endif()



if(LIBFABRIC_PREFIX)

unset(_CMAKE_PREFIX_PATH)

if(POLICY CMP0074)

  cmake_policy(SET CMP0074 NEW)

else()

  if(NOT LIBFABRIC_ROOT)

    set(LIBFABRIC_ROOT "$ENV{LIBFABRIC_ROOT}")

  endif()

  if(LIBFABRIC_ROOT)

    set(_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

  list(INSERT CMAKE_PREFIX_PATH 0 ${LIBFABRIC_PREFIX})

    list(INSERT CMAKE_PREFIX_PATH 0 ${LIBFABRIC_ROOT})

  endif()

endif()



include(CMakeFindDependencyMacro)

find_dependency(PkgConfig)

find_package(PkgConfig)

if(PKG_CONFIG_FOUND)

  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)

  pkg_check_modules(LIBFABRIC IMPORTED_TARGET libfabric)

endif()



if(_CMAKE_PREFIX_PATH)

  set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH})

  unset(_CMAKE_PREFIX_PATH)

endif()



if(LIBFABRIC_FOUND)

  if(NOT TARGET libfabric::libfabric)

    add_library(libfabric::libfabric INTERFACE IMPORTED)

    if(NOT BUILD_SHARED_LIBS AND TARGET PkgConfig::LIBFABRIC-static)

      set_target_properties(libfabric::libfabric PROPERTIES

        INTERFACE_LINK_LIBRARIES PkgConfig::LIBFABRIC-static)

    else()

      set_target_properties(libfabric::libfabric PROPERTIES

        INTERFACE_LINK_LIBRARIES PkgConfig::LIBFABRIC)

    endif()

  endif()

endif()

cmake/FindPkgConfig.cmake

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------#

# Distributed under the OSI-approved Apache License, Version 2.0.  See

# accompanying file Copyright.txt for details.

#------------------------------------------------------------------------------#



# This module is already included in new versions of CMake

if(CMAKE_VERSION VERSION_LESS 3.12)

  include(${CMAKE_CURRENT_LIST_DIR}/upstream/FindPkgConfig.cmake)

else()

  include(${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)

endif()

cmake/upstream/FindPkgConfig.cmake

0 → 100644
+732 −0

File added.

Preview size limit exceeded, changes collapsed.