From f15b5f2b60ba114d93623d3eea098455410b4ce3 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 3 Jul 2020 14:20:08 +0300 Subject: [PATCH] CMAKE: Added IR reader dependency to dev_targets (#1202) --- inference-engine/CMakeLists.txt | 3 ++- inference-engine/cmake/plugins/plugins.cmake | 4 ++-- inference-engine/src/inference_engine/ie_network_reader.cpp | 2 +- inference-engine/src/readers/ir_reader_v7/CMakeLists.txt | 2 +- inference-engine/tests/unit/inference_engine/CMakeLists.txt | 2 +- inference-engine/tests_deprecated/unit/CMakeLists.txt | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt index ce203fb..2d1cc70 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt @@ -54,7 +54,8 @@ function(ie_developer_export) APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") # Custom target to build only Inference Engine Developer Package targets - add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags) + add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags + inference_engine_ir_reader inference_engine_ir_v7_reader) endfunction() add_subdirectory(thirdparty) diff --git a/inference-engine/cmake/plugins/plugins.cmake b/inference-engine/cmake/plugins/plugins.cmake index 34a45e1..ef1dccc 100644 --- a/inference-engine/cmake/plugins/plugins.cmake +++ b/inference-engine/cmake/plugins/plugins.cmake @@ -88,8 +88,8 @@ function(ie_add_plugin) if(TARGET inference_engine_ir_reader) add_dependencies(${IE_PLUGIN_NAME} inference_engine_ir_reader) endif() - if(TARGET inference_engine_ir_reader_v7) - add_dependencies(${IE_PLUGIN_NAME} inference_engine_ir_reader_v7) + if(TARGET inference_engine_ir_v7_reader) + add_dependencies(${IE_PLUGIN_NAME} inference_engine_ir_v7_reader) endif() if(TARGET inference_engine_onnx_reader) add_dependencies(${IE_PLUGIN_NAME} inference_engine_onnx_reader) diff --git a/inference-engine/src/inference_engine/ie_network_reader.cpp b/inference-engine/src/inference_engine/ie_network_reader.cpp index 44c1fe9..c98333c 100644 --- a/inference-engine/src/inference_engine/ie_network_reader.cpp +++ b/inference-engine/src/inference_engine/ie_network_reader.cpp @@ -125,7 +125,7 @@ void registerReaders() { readers.emplace("xml", irReaderv10); // try to load IR reader v7 if library exists - auto irReaderv7 = create_if_exists("IRv7", std::string("inference_engine_ir_reader_v7") + std::string(IE_BUILD_POSTFIX)); + auto irReaderv7 = create_if_exists("IRv7", std::string("inference_engine_ir_v7_reader") + std::string(IE_BUILD_POSTFIX)); if (irReaderv7) readers.emplace("xml", irReaderv7); diff --git a/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt b/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt index 96151cd..1200a41 100644 --- a/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt +++ b/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TARGET_NAME "inference_engine_ir_reader_v7") +set(TARGET_NAME "inference_engine_ir_v7_reader") if(ENABLE_LTO) ie_enable_lto() diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt index 9822bb7..345885c 100644 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt @@ -9,7 +9,7 @@ addIeTargetTest( ROOT ${CMAKE_CURRENT_SOURCE_DIR} LINK_LIBRARIES unitTestUtils - inference_engine_ir_reader_v7 + inference_engine_ir_v7_reader ADD_CPPLINT DEPENDENCIES mock_engine diff --git a/inference-engine/tests_deprecated/unit/CMakeLists.txt b/inference-engine/tests_deprecated/unit/CMakeLists.txt index 39a53b0..6616b7e 100644 --- a/inference-engine/tests_deprecated/unit/CMakeLists.txt +++ b/inference-engine/tests_deprecated/unit/CMakeLists.txt @@ -143,7 +143,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE # dynamic libraries inference_engine_lp_transformations inference_engine_transformations - inference_engine_ir_reader_v7 + inference_engine_ir_v7_reader ${CMAKE_DL_LIBS}) if(TARGET libGNAStubs) -- 2.7.4