natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed PKGCONFIG_OpenVINO_REQUIRES_PRIVATE (#14033) 

* Removed PKGCONFIG_OpenVINO_REQUIRES_PRIVATE

* Removed redundant call

Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
This commit is contained in:
Ilya Churaev 2022-11-17 13:40:33 +04:00 committed by GitHub
parent 5c0225d358
commit 807279276b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/templates/openvino.pc.in
View File

@ -16,8 +16,7 @@ Name: OpenVINO
Description: OpenVINO™ Toolkit
URL: https://docs.openvino.ai/latest/index.html
Version: @OpenVINO_VERSION@
Requires.private: @PKGCONFIG_OpenVINO_REQUIRES_PRIVATE@
Conflicts: openvino < @OpenVINO_VERSION@
Cflags: -I${includedir_old} -I${includedir_new}
Libs: -L${libdir} @PKGCONFIG_OpenVINO_FRONTENDS@ -lopenvino_c -lopenvino @PKGCONFIG_OpenVINO_PRIVATE_DEPS@
Libs.private: -ldl -lm -lpthread -lrt
Libs.private: -ldl -lm -lpthread -lrt

24
src/cmake/openvino.cmake
View File

@ -212,10 +212,10 @@ if(ENABLE_PKGCONFIG_GEN)
endif()
endforeach()
# fill in PKGCONFIG_OpenVINO_REQUIRES_PRIVATE and PKGCONFIG_OpenVINO_PRIVATE_DEPS
# fill in PKGCONFIG_OpenVINO_PRIVATE_DEPS
if(ENABLE_SYSTEM_TBB)
set(PKGCONFIG_OpenVINO_REQUIRES_PRIVATE "tbb")
set(PKGCONFIG_OpenVINO_PRIVATE_DEPS "-ltbb")
elseif(TBB_FOUND)
if(NOT pkg_config_tbb_lib_dir)
message(FATAL_ERROR "Internal error: variable 'pkg_config_tbb_lib_dir' is not defined")
@ -225,24 +225,10 @@ if(ENABLE_PKGCONFIG_GEN)
endif()
if(ENABLE_SYSTEM_PUGIXML)
pkg_check_modules(PKGCONFIG_pugixml QUIET
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
pugixml)
set(pugixml_dep "pugixml = ${PKGCONFIG_pugixml_VERSION}")
if(pugixml_buggy_pkgconfig)
if(PKGCONFIG_OpenVINO_PRIVATE_DEPS)
set(PKGCONFIG_OpenVINO_PRIVATE_DEPS "${PKGCONFIG_OpenVINO_PRIVATE_DEPS} -lpugixml")
else()
set(PKGCONFIG_OpenVINO_PRIVATE_DEPS "-lpugixml")
endif()
if(PKGCONFIG_OpenVINO_PRIVATE_DEPS)
set(PKGCONFIG_OpenVINO_PRIVATE_DEPS "${PKGCONFIG_OpenVINO_PRIVATE_DEPS} -lpugixml")
else()
if(PKGCONFIG_OpenVINO_REQUIRES_PRIVATE)
set(PKGCONFIG_OpenVINO_REQUIRES_PRIVATE "${PKGCONFIG_OpenVINO_REQUIRES_PRIVATE}, ${pugixml_dep}")
else()
set(PKGCONFIG_OpenVINO_REQUIRES_PRIVATE "${pugixml_dep}")
endif()
set(PKGCONFIG_OpenVINO_PRIVATE_DEPS "-lpugixml")
endif()
endif()