packaging/0002-CMake-Add-a-variable-to-resolve-dependency-on-TBB-us.patch

   1 From 65cf6a4b47ac7ec376e29808e9b48758b84d8e47 Mon Sep 17 00:00:00 2001
   2 From: Wook Song <wook16.song@samsung.com>
   3 Date: Wed, 13 Nov 2019 14:57:03 +0900
   4 Subject: [PATCH 2/3] [CMake] Add a variable to resolve dependency on TBB using
   5  system library
   6
   7 In order to resolve the build dependency on TBB using one installed in
   8 the system, this patch adds a variable to the dependencies.cmake file.
   9
  10 Signed-off-by: Wook Song <wook16.song@samsung.com>
  11 ---
  12  inference-engine/cmake/dependencies.cmake | 21 +++++++++++++++------
  13  1 file changed, 15 insertions(+), 6 deletions(-)
  14
  15 diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
  16 index 89d0c41f..561b057a 100644
  17 --- a/inference-engine/cmake/dependencies.cmake
  18 +++ b/inference-engine/cmake/dependencies.cmake
  19 @@ -7,6 +7,9 @@ cmake_policy(SET CMP0054 NEW)
  20  #we have number of dependencies stored on ftp
  21  include(dependency_solver)
  22
  23 +include(FindPkgConfig)
  24 +find_package(PkgConfig REQUIRED)
  25 +
  26  set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
  27
  28  include(ExternalProject)
  29 @@ -79,10 +82,14 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
  30                  ENVIRONMENT "TBBROOT"
  31                  VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
  32      elseif(LINUX)
  33 -        RESOLVE_DEPENDENCY(TBB
  34 -                ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
  35 -                TARGET_PATH "${TEMP}/tbb"
  36 -                ENVIRONMENT "TBBROOT")
  37 +        if (USE_TBB_SYSTEM_DEPS)
  38 +            pkg_search_module(TBB REQUIRED libtbb)
  39 +        else(USE_TBB_SYSTEM_DEPS)
  40 +            RESOLVE_DEPENDENCY(TBB
  41 +                    ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
  42 +                    TARGET_PATH "${TEMP}/tbb"
  43 +                    ENVIRONMENT "TBBROOT")
  44 +        endif (USE_TBB_SYSTEM_DEPS)
  45      else(APPLE)
  46          RESOLVE_DEPENDENCY(TBB
  47                  ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz"
  48 @@ -90,8 +97,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
  49                  ENVIRONMENT "TBBROOT"
  50                  VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
  51      endif()
  52 -    log_rpath_from_dir(TBB "${TBB}/lib")
  53 -    debug_message(STATUS "tbb=" ${TBB})
  54 +    if (NOT USE_TBB_SYSTEM_DEPS)
  55 +        log_rpath_from_dir(TBB "${TBB}/lib")
  56 +        debug_message(STATUS "tbb=" ${TBB})
  57 +    endif (NOT USE_TBB_SYSTEM_DEPS)
  58  endif ()
  59
  60  if (ENABLE_OPENCV)
  61 --
  62 2.17.1
  63