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

Tried to use dependencies on system

Browse Source
This commit is contained in:
Ilya Lavrenov
2022-04-03 11:13:40 +03:00
parent 88415fc133
commit 0f2e2bbdcb
8 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
install_build_dependencies.sh
View File

@@ -44,6 +44,8 @@ if [ -f /etc/lsb-release ]; then
$x86_64_specific_packages \
libgtk2.0-dev \
pkg-config \
libflags-dev \
zlib1g-dev \
unzip \
automake \
libtool \
@@ -97,6 +99,9 @@ elif [ -f /etc/redhat-release ]; then
gcc \
gcc-c++ \
make \
pkg-config \
libflags-dev \
zlib1g-dev \
glibc-static \
glibc-devel \
libstdc++-static \
@@ -152,6 +157,8 @@ elif [ -f /etc/os-release ] && grep -q "raspbian" /etc/os-release; then
libboost-regex-dev \
libgtk2.0-dev \
pkg-config \
libflags-dev \
zlib1g-dev \
unzip \
automake \
libtool \

20
samples/cpp/CMakeLists.txt
View File

@@ -112,14 +112,28 @@ if(NOT TARGET gflags)
find_package(gflags QUIET COMPONENTS nothreads_shared)
if(gflags_FOUND)
message(STATUS "gflags (${gflags_VERSION}) are found at ${gflags_DIR}")
message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}")
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
endif()
endif()
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib")
add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL)
if(NOT TARGET zlib::zlib)
find_package(PkgConfig QUIET)
if(PkgConfig_FOUND)
pkg_search_module(zlib QUIET
IMPORTED_TARGET
zlib)
if(zlib_FOUND)
add_library(zlib::zlib ALIAS PkgConfig::zlib)
endif()
endif()
if(zlib_FOUND)
message(STATUS "zlib (${zlib_VERSION}) is found at ${zlib_PREFIX}")
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib")
add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL)
endif()
endif()
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy")

6
scripts/install_dependencies/install_openvino_dependencies.sh
View File

@@ -101,7 +101,7 @@ if [ "$os" == "ubuntu18.04" ] ; then
pkgs_opencv_req=(libgtk-3-0 libgl1)
pkgs_python=(python3 python3-dev python3-venv python3-setuptools python3-pip)
pkgs_dev=(cmake g++ gcc libc6-dev make curl sudo)
pkgs_dev=(cmake pkg-config libflags-dev zlib1g-dev g++ gcc libc6-dev make curl sudo)
pkgs_myriad=(libusb-1.0-0)
pkgs_cl_compiler=(libtinfo5)
pkgs_opencv_opt=(
@@ -122,7 +122,7 @@ elif [ "$os" == "ubuntu20.04" ] ; then
pkgs_opencv_req=(libgtk-3-0 libgl1)
pkgs_python=(python3 python3-dev python3-venv python3-setuptools python3-pip)
pkgs_dev=(cmake g++ gcc libc6-dev make curl sudo)
pkgs_dev=(cmake pkg-config g++ gcc libc6-dev libflags-dev zlib1g-dev make curl sudo)
pkgs_myriad=(libusb-1.0-0)
pkgs_cl_compiler=(libtinfo5)
pkgs_opencv_opt=(
@@ -143,7 +143,7 @@ elif [ "$os" == "rhel8" ] ; then
pkgs_opencv_req=(gtk3)
pkgs_python=(python3 python3-devel python3-setuptools python3-pip)
pkgs_dev=(gcc gcc-c++ make glibc libstdc++ libgcc cmake curl sudo)
pkgs_dev=(gcc gcc-c++ make glibc libstdc++ libgcc cmake pkg-config libflags-dev zlib1g-dev curl sudo)
pkgs_myriad=()
pkgs_opencv_opt=(
gstreamer1

28
thirdparty/CMakeLists.txt vendored
View File

@@ -12,7 +12,6 @@ endif()
add_subdirectory(ittapi)
add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
add_subdirectory(zlib EXCLUDE_FROM_ALL)
add_subdirectory(cnpy EXCLUDE_FROM_ALL)
if(ENABLE_INTEL_GPU)
add_subdirectory(ocl)
@@ -22,6 +21,25 @@ add_subdirectory(xbyak EXCLUDE_FROM_ALL)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
ov_install_static_lib(xbyak openvino_common)
#
# zlib
#
find_package(PkgConfig QUIET)
if(PkgConfig_FOUND)
pkg_search_module(zlib QUIET
IMPORTED_TARGET GLOBAL
zlib)
if(zlib_FOUND)
add_library(zlib::zlib ALIAS PkgConfig::zlib)
message(STATUS "zlib (${zlib_VERSION}) is found at ${zlib_PREFIX}")
endif()
endif()
if(NOT zlib_FOUND)
add_subdirectory(zlib EXCLUDE_FROM_ALL)
endif()
#
# Pugixml
#
@@ -65,7 +83,10 @@ ov_install_static_lib(fluid openvino_common)
#
find_package(gflags QUIET COMPONENTS nothreads_shared)
if(NOT gflags_FOUND)
if(gflags_FOUND)
set_target_properties(gflags PROPERTIES GLOBAL ON)
message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}")
else()
add_subdirectory(gflags EXCLUDE_FROM_ALL)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
endif()
@@ -154,6 +175,9 @@ if(CPACK_GENERATOR STREQUAL "DEB")
if(NOT gflags_FOUND)
message(FATAL_ERROR "gflags must be used as a debian package. Install libflags-dev")
endif()
if(NOT zlib_FOUND)
message(FATAL_ERROR "zlib must be used as a debian package. Install zlib1g-dev")
endif()
else()
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
DESTINATION ${OV_CPACK_SAMPLESDIR}/cpp/thirdparty

2
thirdparty/cnpy/CMakeLists.txt vendored
View File

@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
PRIVATE -Wno-all)
endif()
target_link_libraries(${TARGET_NAME} PUBLIC zlib)
target_link_libraries(${TARGET_NAME} PUBLIC zlib::zlib)
target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)

1
thirdparty/zlib/CMakeLists.txt vendored
View File

@@ -49,6 +49,7 @@ set(lib_hdrs
set(lib_ext_hdrs "zlib/zlib.h" "zlib/zconf.h")
add_library(${TARGET_NAME} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
add_library(${TARGET_NAME}::${TARGET_NAME} ALIAS ${TARGET_NAME})
target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/zlib")

4
tools/compile_tool/CMakeLists.txt
View File

@@ -19,10 +19,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
target_compile_options(${TARGET_NAME} PRIVATE -Wall)
endif()
if(NOT TARGET gflags)
find_package(gflags QUIET COMPONENTS nothreads_shared)
endif()
target_link_libraries(${TARGET_NAME} PRIVATE
inference_engine
inference_engine_plugin_api

4
tools/legacy/benchmark_app/CMakeLists.txt
View File

@@ -18,10 +18,6 @@ add_executable(${TARGET_NAME} ${SRC} ${HDR})
find_package(OpenVINO REQUIRED COMPONENTS Runtime)
if(NOT TARGET gflags)
find_package(gflags QUIET COMPONENTS nothreads_shared)
endif()
set_target_properties(${TARGET_NAME} PROPERTIES
COMPILE_PDB_NAME ${TARGET_NAME}
FOLDER tools