diff --git a/docs/dev/build_mac_arm.md b/docs/dev/build_mac_arm.md index 80678bb6ce4..fb728d18d5f 100644 --- a/docs/dev/build_mac_arm.md +++ b/docs/dev/build_mac_arm.md @@ -33,7 +33,7 @@ The software was validated on: ``` - (arm64 only) Product and samples dependencies: ```sh - % brew install tbb pugixml flatbuffers snappy protobuf nlohmann-json zlib gflags + % brew install tbb pugixml flatbuffers snappy protobuf ``` - Additional `pip` dependencies to build OpenVINO Runtime Python API, Development tools (Model Optimizer, POT and others): ```sh diff --git a/docs/dev/build_mac_intel_cpu.md b/docs/dev/build_mac_intel_cpu.md index 606178e3f37..8d57aa12aae 100644 --- a/docs/dev/build_mac_intel_cpu.md +++ b/docs/dev/build_mac_intel_cpu.md @@ -30,7 +30,7 @@ The software was validated on: ``` - (Optional; native compilation only, x86_64) Product and samples dependencies: ```sh - % brew install tbb pugixml flatbuffers snappy protobuf nlohmann-json zlib gflags + % brew install tbb pugixml flatbuffers snappy protobuf ``` - Additional `pip` dependencies to build OpenVINO Runtime Python API, Development tools (Model Optimizer, POT and others): ```sh diff --git a/install_build_dependencies.sh b/install_build_dependencies.sh index de2a53a25c9..61a8cf5974b 100755 --- a/install_build_dependencies.sh +++ b/install_build_dependencies.sh @@ -69,9 +69,7 @@ if [ -f /etc/lsb-release ] || [ -f /etc/debian_version ] ; then libffi-dev \ `# spell checking for MO sources` \ python3-enchant \ - `# samples and tools` \ - libgflags-dev \ - zlib1g-dev \ + `# tools` \ wget # TF lite frontend if apt-cache search --names-only '^libflatbuffers-dev'| grep -q libflatbuffers-dev; then @@ -128,10 +126,7 @@ elif [ -f /etc/redhat-release ] || grep -q "rhel" /etc/os-release ; then opencl-headers \ `# python API` \ python3-pip \ - python3-devel \ - `# samples and tools` \ - zlib-devel \ - gflags-devel + python3-devel elif [ -f /etc/os-release ] && grep -q "SUSE" /etc/os-release ; then zypper refresh zypper install -y \ @@ -169,11 +164,7 @@ elif [ -f /etc/os-release ] && grep -q "SUSE" /etc/os-release ; then `# python API` \ python39-pip \ python39-setuptools \ - python39-devel \ - `# samples and tools` \ - zlib-devel \ - gflags-devel-static \ - nlohmann_json-devel + python39-devel elif [ -f /etc/os-release ] && grep -q "raspbian" /etc/os-release; then # Raspbian apt update @@ -200,11 +191,7 @@ elif [ -f /etc/os-release ] && grep -q "raspbian" /etc/os-release; then python3-pip \ python3-venv \ python3-setuptools \ - libpython3-dev \ - `# samples and tools` \ - libgflags-dev \ - zlib1g-dev \ - nlohmann-json-dev + libpython3-dev else echo "Unknown OS, please install build dependencies manually" fi diff --git a/src/frontends/paddle/tests/CMakeLists.txt b/src/frontends/paddle/tests/CMakeLists.txt index 078a133138a..1604103638d 100644 --- a/src/frontends/paddle/tests/CMakeLists.txt +++ b/src/frontends/paddle/tests/CMakeLists.txt @@ -33,7 +33,7 @@ ov_add_test_target( openvino_paddle_frontend paddle_fe_standalone_build_test LINK_LIBRARIES - cnpy + openvino::cnpy frontend_shared_test_classes openvino_paddle_frontend openvino::runtime diff --git a/src/frontends/tests/frontend/shared/CMakeLists.txt b/src/frontends/tests/frontend/shared/CMakeLists.txt index f413e359afb..5f4328d24ac 100644 --- a/src/frontends/tests/frontend/shared/CMakeLists.txt +++ b/src/frontends/tests/frontend/shared/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(${TARGET_NAME} openvino::util openvino::runtime PRIVATE - cnpy) + openvino::cnpy) add_dependencies(${TARGET_NAME} test_builtin_extensions) diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt index fc154c2f5fc..6f18bab6476 100644 --- a/tests/fuzz/src/CMakeLists.txt +++ b/tests/fuzz/src/CMakeLists.txt @@ -17,7 +17,7 @@ foreach(test_source ${tests}) add_fuzzer(${test_name} ${test_source}) target_link_libraries(${test_name} PRIVATE - openvino::runtime cnpy zlib) + openvino::runtime openvino::cnpy openvino::zlib) add_dependencies(fuzz ${test_name}) diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt index c10d23301d9..c418256aed0 100644 --- a/thirdparty/cnpy/CMakeLists.txt +++ b/thirdparty/cnpy/CMakeLists.txt @@ -4,16 +4,17 @@ project(cnpy) -set(TARGET_NAME "cnpy") +set(TARGET_NAME "openvino_cnpy") add_library(${TARGET_NAME} STATIC cnpy.cpp) +add_library(openvino::cnpy ALIAS ${TARGET_NAME}) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable PRIVATE -Wno-all) endif() -target_link_libraries(${TARGET_NAME} PUBLIC ZLIB::ZLIB) +target_link_libraries(${TARGET_NAME} PUBLIC openvino::zlib) target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty) diff --git a/thirdparty/zlib/CMakeLists.txt b/thirdparty/zlib/CMakeLists.txt index f52d7bd027b..53974f8029a 100644 --- a/thirdparty/zlib/CMakeLists.txt +++ b/thirdparty/zlib/CMakeLists.txt @@ -24,7 +24,7 @@ else() endif() endif() -set(TARGET_NAME "zlib") +set(TARGET_NAME "openvino_zlib") set(zlib_srcs zlib/adler32.c @@ -59,7 +59,7 @@ set(zlib_ext_hdrs zlib/zconf.h) add_library(${TARGET_NAME} STATIC ${zlib_srcs} ${zlib_hdrs} ${lib_ext_hdrs}) -add_library(ZLIB::ZLIB ALIAS ${TARGET_NAME}) +add_library(openvino::zlib ALIAS ${TARGET_NAME}) target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/zlib")