From: Wook Song <wook16.song@samsung.com>
Date: Sun, 15 Dec 2019 23:53:26 +0000 (+0900)
Subject: bugfix: Add omitted patch files
X-Git-Tag: submit/tizen/20191217.023013~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F220188%2F1;p=platform%2Fupstream%2Fdldt.git

bugfix: Add omitted patch files

This patch fixes a bug incurred by omitted local patch files.

Change-Id: Id7045a3d5e4af0b7e3853451e2344e305f151ebe
Signed-off-by: Wook Song <wook16.song@samsung.com>
---

diff --git a/packaging/0001-CMake-Do-not-call-get_linux_name-when-LINUX_OS_NAME-.patch b/packaging/0001-CMake-Do-not-call-get_linux_name-when-LINUX_OS_NAME-.patch
new file mode 100644
index 0000000..615bf76
--- /dev/null
+++ b/packaging/0001-CMake-Do-not-call-get_linux_name-when-LINUX_OS_NAME-.patch
@@ -0,0 +1,37 @@
+From 9f1b68a48c93b01bf4ed61a96dafa7f1ac3ca2a5 Mon Sep 17 00:00:00 2001
+From: Wook Song <wook16.song@samsung.com>
+Date: Wed, 13 Nov 2019 14:45:42 +0900
+Subject: [PATCH 1/3] [CMake] Do not call get_linux_name when LINUX_OS_NAME is
+ provided
+
+In order to handle other OS platforms that are not compatible with the
+function, get_linux_name, in dependencies.cmake, this patch makes this
+function be not invoked when LINUX_OS_NAME is provided from outside.
+
+Signed-off-by: Wook Song <wook16.song@samsung.com>
+---
+ inference-engine/cmake/dependencies.cmake | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
+index 682f2e55..89d0c41f 100644
+--- a/inference-engine/cmake/dependencies.cmake
++++ b/inference-engine/cmake/dependencies.cmake
+@@ -12,9 +12,11 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
+ include(ExternalProject)
+ 
+ include(linux_name)
+-if(COMMAND get_linux_name)
+-    get_linux_name(LINUX_OS_NAME)
+-endif()
++if (NOT DEFINED LINUX_OS_NAME)
++    if(COMMAND get_linux_name)
++        get_linux_name(LINUX_OS_NAME)
++    endif()
++endif (NOT DEFINED LINUX_OS_NAME)
+ 
+ if (ENABLE_MYRIAD)
+     include(vpu_dependencies)
+-- 
+2.17.1
+
diff --git a/packaging/0002-CMake-Add-a-variable-to-resolve-dependency-on-TBB-us.patch b/packaging/0002-CMake-Add-a-variable-to-resolve-dependency-on-TBB-us.patch
new file mode 100644
index 0000000..58b4805
--- /dev/null
+++ b/packaging/0002-CMake-Add-a-variable-to-resolve-dependency-on-TBB-us.patch
@@ -0,0 +1,63 @@
+From 65cf6a4b47ac7ec376e29808e9b48758b84d8e47 Mon Sep 17 00:00:00 2001
+From: Wook Song <wook16.song@samsung.com>
+Date: Wed, 13 Nov 2019 14:57:03 +0900
+Subject: [PATCH 2/3] [CMake] Add a variable to resolve dependency on TBB using
+ system library
+
+In order to resolve the build dependency on TBB using one installed in
+the system, this patch adds a variable to the dependencies.cmake file.
+
+Signed-off-by: Wook Song <wook16.song@samsung.com>
+---
+ inference-engine/cmake/dependencies.cmake | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
+index 89d0c41f..561b057a 100644
+--- a/inference-engine/cmake/dependencies.cmake
++++ b/inference-engine/cmake/dependencies.cmake
+@@ -7,6 +7,9 @@ cmake_policy(SET CMP0054 NEW)
+ #we have number of dependencies stored on ftp
+ include(dependency_solver)
+ 
++include(FindPkgConfig)
++find_package(PkgConfig REQUIRED)
++
+ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
+ 
+ include(ExternalProject)
+@@ -79,10 +82,14 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
+                 ENVIRONMENT "TBBROOT"
+                 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+     elseif(LINUX)
+-        RESOLVE_DEPENDENCY(TBB
+-                ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
+-                TARGET_PATH "${TEMP}/tbb"
+-                ENVIRONMENT "TBBROOT")
++        if (USE_TBB_SYSTEM_DEPS)
++            pkg_search_module(TBB REQUIRED libtbb)
++        else(USE_TBB_SYSTEM_DEPS)
++            RESOLVE_DEPENDENCY(TBB
++                    ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
++                    TARGET_PATH "${TEMP}/tbb"
++                    ENVIRONMENT "TBBROOT")
++        endif (USE_TBB_SYSTEM_DEPS)
+     else(APPLE)
+         RESOLVE_DEPENDENCY(TBB
+                 ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz"
+@@ -90,8 +97,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
+                 ENVIRONMENT "TBBROOT"
+                 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
+     endif()
+-    log_rpath_from_dir(TBB "${TBB}/lib")
+-    debug_message(STATUS "tbb=" ${TBB})
++    if (NOT USE_TBB_SYSTEM_DEPS)
++        log_rpath_from_dir(TBB "${TBB}/lib")
++        debug_message(STATUS "tbb=" ${TBB})
++    endif (NOT USE_TBB_SYSTEM_DEPS)
+ endif ()
+ 
+ if (ENABLE_OPENCV)
+-- 
+2.17.1
+