@@ -28,44 +28,22 @@ set(COMMON_INCLUDE_DIRS ${EXECUTORCH_ROOT}/..)
2828# Include utility CMake scripts from ExecuteTorch
2929include (${EXECUTORCH_ROOT} /build /Utils.cmake)
3030
31- # Set OpenVINO directory from environment variable
32- set (OPENVINO_DIR "$ENV{INTEL_OPENVINO_DIR} " )
33- if (NOT OPENVINO_DIR)
34- message (FATAL_ERROR "ERROR: INTEL_OPENVINO_DIR environment variable is not set." )
35- endif ()
36-
37- # Set OpenVINO include directories
38- set (OPENVINO_INCLUDE_DIRS
39- ${OPENVINO_DIR} /runtime/include
40- ${OPENVINO_DIR} /deployment_tools/inference_engine/include
41- )
42-
43- # Set OpenVINO library path
44- set (OPENVINO_LIB_PATH ${OPENVINO_DIR} /runtime/lib/intel64)
45-
46- # Try to locate OpenVINO automatically
47- find_library (OPENVINO_LIB NAMES openvino PATHS ${OPENVINO_LIB_PATH} NO_DEFAULT_PATH)
48- if (NOT OPENVINO_LIB)
49- message (FATAL_ERROR "ERROR: OpenVINO library (libopenvino.so) not found in ${OPENVINO_LIB_PATH} " )
50- endif ()
31+ find_package (OpenVINO REQUIRED)
5132
5233# Define OpenVINO backend as a shared library
53- add_library (openvino_backend SHARED)
34+ add_library (openvino_backend SHARED . )
5435
5536# Enable exceptions and RTTI for OpenVINO backend
5637target_compile_options (openvino_backend PRIVATE -frtti -fexceptions)
5738
58- # Include ExecuteTorch and OpenVINO directories
59- target_include_directories (openvino_backend PUBLIC ${COMMON_INCLUDE_DIRS} ${OPENVINO_INCLUDE_DIRS} )
39+ # Include Executorch directories
40+ target_include_directories (openvino_backend PUBLIC ${COMMON_INCLUDE_DIRS} )
6041
6142# Link OpenVINO and ExecuteTorch core libraries
62- target_link_libraries (openvino_backend PRIVATE ${OPENVINO_LIB} executorch_core)
43+ target_link_libraries (openvino_backend PRIVATE openvino::runtime executorch_core)
6344
6445# Add source files for OpenVINO backend
6546target_sources (openvino_backend PRIVATE ${CMAKE_CURRENT_LIST_DIR} /runtime/OpenvinoBackend.cpp)
6647
67- # Set runtime library path for OpenVINO
68- target_link_options (openvino_backend PRIVATE -Wl,-rpath=${OPENVINO_LIB_PATH} )
69-
7048# Install OpenVINO backend library to the lib directory
7149install (TARGETS openvino_backend DESTINATION lib)
0 commit comments