diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c52c1cfaf..0ed7e41be3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1583,11 +1583,16 @@ if(WITH_INF_ENGINE OR INF_ENGINE_TARGET) if(INF_ENGINE_TARGET) set(__msg "YES (${INF_ENGINE_RELEASE} / ${INF_ENGINE_VERSION})") get_target_property(_lib ${INF_ENGINE_TARGET} IMPORTED_LOCATION) - if(NOT _lib) - get_target_property(_lib_rel ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_RELEASE) - get_target_property(_lib_dbg ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_DEBUG) - set(_lib "${_lib_rel} / ${_lib_dbg}") - endif() + get_target_property(_lib_imp_rel ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_RELEASE) + get_target_property(_lib_imp_dbg ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_DEBUG) + get_target_property(_lib_rel ${INF_ENGINE_TARGET} IMPORTED_LOCATION_RELEASE) + get_target_property(_lib_dbg ${INF_ENGINE_TARGET} IMPORTED_LOCATION_DEBUG) + ocv_build_features_string(_lib + IF _lib THEN "${_lib}" + IF _lib_imp_rel AND _lib_imp_dbg THEN "${_lib_imp_rel} / ${_lib_imp_dbg}" + IF _lib_rel AND _lib_dbg THEN "${_lib_rel} / ${_lib_dbg}" + ELSE "unknown" + ) get_target_property(_inc ${INF_ENGINE_TARGET} INTERFACE_INCLUDE_DIRECTORIES) status(" Inference Engine:" "${__msg}") status(" libs:" "${_lib}") diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake index 403b446116..38137f44f0 100644 --- a/cmake/OpenCVDetectTBB.cmake +++ b/cmake/OpenCVDetectTBB.cmake @@ -70,9 +70,13 @@ function(ocv_tbb_env_guess _found) add_library(tbb UNKNOWN IMPORTED) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION "${TBB_ENV_LIB}" - IMPORTED_LOCATION_DEBUG "${TBB_ENV_LIB_DEBUG}" INTERFACE_INCLUDE_DIRECTORIES "${TBB_ENV_INCLUDE}" ) + if (TBB_ENV_LIB_DEBUG) + set_target_properties(tbb PROPERTIES + IMPORTED_LOCATION_DEBUG "${TBB_ENV_LIB_DEBUG}" + ) + endif() # workaround: system TBB library is used for linking instead of provided if(CV_GCC) get_filename_component(_dir "${TBB_ENV_LIB}" DIRECTORY)