From 16dc4d8bc04f12388fca435287aa0de9090232d8 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 16 Jul 2022 15:46:15 +0800 Subject: [PATCH] Try to fix GNA --- src/bindings/c/ov/src/CMakeLists.txt | 6 +++--- src/cmake/openvino.cmake | 4 ++-- src/plugins/intel_gna/CMakeLists.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bindings/c/ov/src/CMakeLists.txt b/src/bindings/c/ov/src/CMakeLists.txt index cc3e9bf7787..bec890cdab0 100644 --- a/src/bindings/c/ov/src/CMakeLists.txt +++ b/src/bindings/c/ov/src/CMakeLists.txt @@ -40,9 +40,9 @@ ie_cpack_add_component(core_c DEPENDS core) ie_cpack_add_component(core_c_dev DEPENDS core_c) install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets - RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c - ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c + RUNTIME DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT core_c + ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT core_c + LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT core_c INCLUDES DESTINATION runtime/include/ie) install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake index 5a68f4cadbb..2d3689bea70 100644 --- a/src/cmake/openvino.cmake +++ b/src/cmake/openvino.cmake @@ -155,9 +155,9 @@ configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOCo set(IE_INCLUDE_DIR "${OV_CPACK_INCLUDEDIR}/ie") set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") set(IE_TBBBIND_DIR "${IE_TBBBIND_DIR_INSTALL}") -set(GNA_PATH "../${OV_CPACK_RUNTIMEDIR}") +set(GNA_PATH "${OV_CPACK_RUNTIMEDIR}") if(WIN32) - set(GNA_PATH "../${OV_CPACK_LIBRARYDIR}/../Release") + set(GNA_PATH "${OV_CPACK_LIBRARYDIR}/../Release") endif() configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in" diff --git a/src/plugins/intel_gna/CMakeLists.txt b/src/plugins/intel_gna/CMakeLists.txt index 863513ab696..64e9307b57f 100644 --- a/src/plugins/intel_gna/CMakeLists.txt +++ b/src/plugins/intel_gna/CMakeLists.txt @@ -82,7 +82,7 @@ foreach(gna_lib IN LISTS gna_libraries) if(gna_lib MATCHES "^.*\.${CMAKE_SHARED_LIBRARY_SUFFIX}(\.[0-9]+)+$" OR WIN32 OR NOT BUILD_SHARED_LIBS) install(FILES ${gna_lib} - DESTINATION ${IE_CPACK_RUNTIME_PATH} + DESTINATION ${OV_CPACK_RUNTIMEDIR} COMPONENT gna) set(gna_library_installed ON) endif() @@ -104,7 +104,7 @@ if(NOT BUILD_SHARED_LIBS) if(WIN32) file(GLOB_RECURSE gna_libraries "${libGNA_LIBRARIES_BASE_PATH}/*${CMAKE_STATIC_LIBRARY_SUFFIX}") install(FILES ${gna_libraries} - DESTINATION ${IE_CPACK_LIBRARY_PATH} + DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT gna) endif() endif()