From: Ricardo Oliveira <[email protected]> When cross-compiling using the SDK, the tbb library and its includes added to the InferenceEngine target are relative to the yocto build stage. While this works if the machine that bakes the image is the same for development, it doesn't work for remotely baked images, which is my case.
This patch fixes the issue, but I do not have the extensive knowledge with yocto or cmake to understand if it is the most correct fix. Signed-off-by: Ricardo Oliveira <[email protected]> --- .../opencv/dldt-inference-engine_2019r3.1.bb | 1 + .../0009-Fix-tbb-paths-installed-in-sdk.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0009-Fix-tbb-paths-installed-in-sdk.patch diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb index b9767517..0914a90a 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.1.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \ file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \ file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \ file://0008-Simplify-searching-for-firmware-files.patch;patchdir=.. \ + file://0009-Fix-tbb-paths-installed-in-sdk.patch;patchdir=.. \ file://run-ptest \ " SRCREV = "fe3f978b98c86eaeed3cbdc280e1ffd0bc50d278" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0009-Fix-tbb-paths-installed-in-sdk.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0009-Fix-tbb-paths-installed-in-sdk.patch new file mode 100644 index 00000000..41fa8d34 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0009-Fix-tbb-paths-installed-in-sdk.patch @@ -0,0 +1,28 @@ +diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake +index 9b03652b..79efc5e2 100644 +--- a/inference-engine/cmake/ie_parallel.cmake ++++ b/inference-engine/cmake/ie_parallel.cmake +@@ -55,7 +55,10 @@ function(set_ie_threading_interface_for TARGET_NAME) + else () + set(IE_THREAD_DEFINE "IE_THREAD_TBB") + +- target_include_directories(${TARGET_NAME} PUBLIC ${TBB_INCLUDE_DIRS}) ++ target_include_directories(${TARGET_NAME} PUBLIC ++ $<BUILD_INTERFACE:${TBB_INCLUDE_DIRS}> ++ $<INSTALL_INTERFACE:include>) ++ + if (WIN32) + target_link_libraries(${TARGET_NAME} PUBLIC "-nodefaultlib:vcomp") + endif () +@@ -73,7 +76,10 @@ function(set_ie_threading_interface_for TARGET_NAME) + endif () + else () + # Link Release library to all configurations. +- target_link_libraries(${TARGET_NAME} PUBLIC ${TBB_LIBRARIES_RELEASE}) ++ get_filename_component(INSTALL_TBB_LIB_RELEASE ${TBB_LIBRARIES_RELEASE} NAME) ++ target_link_libraries(${TARGET_NAME} PUBLIC ++ $<BUILD_INTERFACE:${TBB_LIBRARIES_RELEASE}> ++ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_LIBDIR}/${INSTALL_TBB_LIB_RELEASE}>) + endif () + endif () + endif() -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6343): https://lists.yoctoproject.org/g/meta-intel/message/6343 Mute This Topic: https://lists.yoctoproject.org/mt/69524394/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
