From 108d07c655585a51d5c2ba10b769374a2b25a756 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Sat, 3 Feb 2018 14:27:46 +0300 Subject: [PATCH] TBB: added workaround for linking issue with conflicting system and custom libraries --- cmake/OpenCVDetectTBB.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake index c5b4bfdb16..315b4aded6 100644 --- a/cmake/OpenCVDetectTBB.cmake +++ b/cmake/OpenCVDetectTBB.cmake @@ -71,6 +71,11 @@ function(ocv_tbb_env_guess _found) IMPORTED_LOCATION_DEBUG "${TBB_ENV_LIB_DEBUG}" INTERFACE_INCLUDE_DIRECTORIES "${TBB_ENV_INCLUDE}" ) + # workaround: system TBB library is used for linking instead of provided + if(CMAKE_COMPILER_IS_GNUCXX) + get_filename_component(_dir "${TBB_ENV_LIB}" DIRECTORY) + set_target_properties(tbb PROPERTIES INTERFACE_LINK_LIBRARIES "-L${_dir}") + endif() message(STATUS "Found TBB (env): ${TBB_ENV_LIB}") set(${_found} TRUE PARENT_SCOPE) endif()