diff --git a/FastDeploy.cmake.in b/FastDeploy.cmake.in index 125ce8bd4..5a50fe7ae 100644 --- a/FastDeploy.cmake.in +++ b/FastDeploy.cmake.in @@ -58,9 +58,18 @@ endif() if(ENABLE_OPENVINO_BACKEND) set(OPENVINO_FILENAME @OPENVINO_FILENAME@) find_library(OPENVINO_LIB openvino ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/lib/ NO_DEFAULT_PATH) + set(OPENVINO_LIBS ${OPENVINO_LIB}) # Find tbb libs - find_package(TBB REQUIRED PATHS "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/3rdparty/tbb/") - set(OPENVINO_LIBS ${OPENVINO_LIB} ${TBB_IMPORTED_TARGETS}) + find_package(TBB PATHS "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/3rdparty/tbb/") + if (TBB_FOUND) + list(APPEND OPENVINO_LIBS ${TBB_IMPORTED_TARGETS}) + else() + # TODO(zhoushunjie): Use openvino with tbb on linux in future. + set(OMP_LIB "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/${OPENVINO_FILENAME}/runtime/3rdparty/omp/lib/libiomp5.so") + add_library(omp STATIC IMPORTED GLOBAL) + set_property(TARGET omp PROPERTY IMPORTED_LOCATION ${OMP_LIB}) + list(APPEND OPENVINO_LIBS omp) + endif() message(STATUS "OPENVINO_LIBS = ${OPENVINO_LIBS}") list(APPEND FASTDEPLOY_LIBS ${OPENVINO_LIBS}) endif() diff --git a/cmake/openvino.cmake b/cmake/openvino.cmake index a01cd0936..3e3f518b5 100644 --- a/cmake/openvino.cmake +++ b/cmake/openvino.cmake @@ -67,10 +67,11 @@ if(WIN32) CACHE FILEPATH "OPENVINO shared library." FORCE) file(GLOB_RECURSE OPENVINO_LIB_FILES ${OPENVINO_INSTALL_DIR}/lib/intel64/Release/*) file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/lib/) - file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/lib/intel64) file(GLOB_RECURSE OPENVINO_BIN_FILES ${OPENVINO_INSTALL_DIR}/bin/intel64/Release/*) file(COPY ${OPENVINO_LIB_FILES} DESTINATION ${OPENVINO_INSTALL_DIR}/bin/) + + file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/lib/intel64) file(REMOVE_RECURSE ${OPENVINO_INSTALL_DIR}/bin/intel64) elseif(APPLE) set(OPENVINO_LIB @@ -102,6 +103,7 @@ find_package(TBB PATHS "${OPENVINO_INSTALL_DIR}/3rdparty/tbb") if (TBB_FOUND) list(APPEND OPENVINO_LIBS ${TBB_IMPORTED_TARGETS}) else() + # TODO(zhoushunjie): Use openvino with tbb on linux in future. set(OMP_LIB "${OPENVINO_INSTALL_DIR}/3rdparty/omp/lib/libiomp5.so") add_library(omp STATIC IMPORTED GLOBAL) set_property(TARGET omp PROPERTY IMPORTED_LOCATION