mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14643 from mshabunin:fix-ie-status

Browse Source
This commit is contained in:
Alexander Alekhin 2019-05-27 14:31:10 +00:00
commit d7c465d49e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -1583,11 +1583,16 @@ if(WITH_INF_ENGINE OR INF_ENGINE_TARGET)
if(INF_ENGINE_TARGET) if(INF_ENGINE_TARGET)
set(__msg "YES (${INF_ENGINE_RELEASE} / ${INF_ENGINE_VERSION})") set(__msg "YES (${INF_ENGINE_RELEASE} / ${INF_ENGINE_VERSION})")
get_target_property(_lib ${INF_ENGINE_TARGET} IMPORTED_LOCATION) get_target_property(_lib ${INF_ENGINE_TARGET} IMPORTED_LOCATION)
if(NOT _lib) get_target_property(_lib_imp_rel ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_RELEASE)
get_target_property(_lib_rel ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_RELEASE) get_target_property(_lib_imp_dbg ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_DEBUG)
get_target_property(_lib_dbg ${INF_ENGINE_TARGET} IMPORTED_IMPLIB_DEBUG) get_target_property(_lib_rel ${INF_ENGINE_TARGET} IMPORTED_LOCATION_RELEASE)
set(_lib "${_lib_rel} / ${_lib_dbg}") get_target_property(_lib_dbg ${INF_ENGINE_TARGET} IMPORTED_LOCATION_DEBUG)
endif() 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) get_target_property(_inc ${INF_ENGINE_TARGET} INTERFACE_INCLUDE_DIRECTORIES)
status(" Inference Engine:" "${__msg}") status(" Inference Engine:" "${__msg}")
status(" libs:" "${_lib}") status(" libs:" "${_lib}")

6
cmake/OpenCVDetectTBB.cmake
View File

@ -70,9 +70,13 @@ function(ocv_tbb_env_guess _found)
add_library(tbb UNKNOWN IMPORTED) add_library(tbb UNKNOWN IMPORTED)
set_target_properties(tbb PROPERTIES set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION "${TBB_ENV_LIB}" IMPORTED_LOCATION "${TBB_ENV_LIB}"
IMPORTED_LOCATION_DEBUG "${TBB_ENV_LIB_DEBUG}"
INTERFACE_INCLUDE_DIRECTORIES "${TBB_ENV_INCLUDE}" 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 # workaround: system TBB library is used for linking instead of provided
if(CV_GCC) if(CV_GCC)
get_filename_component(_dir "${TBB_ENV_LIB}" DIRECTORY) get_filename_component(_dir "${TBB_ENV_LIB}" DIRECTORY)