Developer package update (#5970)

* Updated developer package generation

* Try to fix

* Reuse find_package(InferenceEngine) inside DeveloperPackage

* Fixes for ARM

* Fixed double InferenceEngineDeveloperPackage include

* WA for OpenCV

cmake/developer_package/IEDevScriptsConfig.cmake

@@ -223,6 +223,7 @@ include(api_validator/api_validator)
 include(vs_version/vs_version)
 include(plugins/plugins)
 include(add_ie_target)
+include(CMakePackageConfigHelpers)
 
 if(ENABLE_FUZZING)
     enable_fuzzing()

cmake/developer_package/clang_format/clang_format.cmake

@@ -23,7 +23,7 @@ if (ENABLE_CLANG_FORMAT)
     endif()
 endif()
 
-if(ENABLE_CLANG_FORMAT)
+if(ENABLE_CLANG_FORMAT AND NOT TARGET clang_format_check_all)
     add_custom_target(clang_format_check_all)
     add_custom_target(clang_format_fix_all)
     set_target_properties(clang_format_check_all clang_format_fix_all

cmake/developer_package/cpplint/cpplint.cmake

@@ -11,7 +11,7 @@ if(ENABLE_CPPLINT)
     endif()
 endif()
 
-if(ENABLE_CPPLINT)
+if(ENABLE_CPPLINT AND NOT TARGET cpplint_all)
     add_custom_target(cpplint_all ALL)
     set_target_properties(cpplint_all PROPERTIES FOLDER cpplint)
     set(CPPLINT_ALL_OUTPUT_FILES "" CACHE INTERNAL "All cpplint output files")

inference-engine/CMakeLists.txt

@@ -21,7 +21,7 @@ function(ie_developer_export)
     set(all_dev_targets gflags ie_libraries)
     foreach(component IN LISTS openvino_export_components)
         export(TARGETS ${${component}} NAMESPACE IE::
-            APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
+               APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
         list(APPEND all_dev_targets ${${component}})
     endforeach()
 
@@ -143,24 +143,30 @@ endif()
 #
 
 openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils)
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ${NGRAPH_LIBRARIES})
 
 # for Template plugin
 if(NGRAPH_INTERPRETER_ENABLE)
     openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_backend interpreter_backend)
 endif()
 
-ie_developer_export()
+function(ie_generate_dev_package_config)
+    # dummy check that OpenCV is here
+    find_package(OpenCV QUIET)
 
-configure_file(
-    "${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
-    "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
-    @ONLY)
+    ie_developer_export()
 
-configure_file(
-    "${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
-    "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
-    @ONLY)
+    configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
+                                "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
+                                INSTALL_DESTINATION share # not used
+                                PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
+                                NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+
+    configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
+                "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
+                @ONLY)
+endfunction()
+
+ie_generate_dev_package_config()
 
 #
 # Coverage
@@ -175,6 +181,10 @@ endif()
 #
 
 function(register_extra_modules)
+    # post export
+    ie_developer_export_targets(inference_engine)
+    openvino_developer_export_targets(COMPONENT ngraph TARGETS ${NGRAPH_LIBRARIES})
+
     set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/build-modules")
 
     function(generate_fake_dev_package)

inference-engine/cmake/templates/InferenceEngineConfig-version.cmake.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
 

inference-engine/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in

@@ -2,9 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
 # TODO: remove after changing [private plugins]
-set(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_MAIN_SOURCE_DIR@") # KMB
-set(IE_MAIN_SOURCE_DIR "@IE_MAIN_SOURCE_DIR@") # HDDL
+set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_MAIN_SOURCE_DIR@") # KMB
+set_and_check(IE_MAIN_SOURCE_DIR "@IE_MAIN_SOURCE_DIR@") # HDDL
 
 # Variables to export in plugin's projects
 
@@ -22,32 +26,46 @@ endforeach()
 message("")
 
 # for samples in 3rd party projects
-set(gflags_DIR "@gflags_BINARY_DIR@")
+set_and_check(gflags_DIR "@gflags_BINARY_DIR@")
 
-# Targets
+#
+# Content
+#
 
-if(USE_SYSTEM_PUGIXML)
-    find_package(PugiXML REQUIRED)
-    set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE)
-endif()
+find_dependency(IEDevScripts
+                PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
+                NO_CMAKE_FIND_ROOT_PATH
+                NO_DEFAULT_PATH)
+
+find_dependency(InferenceEngine
+                PATHS "${CMAKE_CURRENT_LIST_DIR}"
+                NO_CMAKE_FIND_ROOT_PATH
+                NO_DEFAULT_PATH)
+
+# WA for cmake: it exports ngraph as IE::ngraph in the IE export list
+# while we already have ngraph export in its own export list as ngraph::ngraph
+set_property(TARGET ngraph::ngraph PROPERTY IMPORTED_GLOBAL TRUE)
+add_library(IE::ngraph ALIAS ngraph::ngraph)
 
 foreach(component @openvino_export_components@)
     include("${CMAKE_CURRENT_LIST_DIR}/${component}_dev_targets.cmake")
 endforeach()
 
-set(InferenceEngine_LIBRARIES IE::inference_engine)
+if(USE_SYSTEM_PUGIXML)
+    find_dependency(PugiXML)
+    set_property(TARGET pugixml PROPERTY IMPORTED_GLOBAL TRUE)
+endif()
+
+# inherit OpenCV from main IE project if enabled
+if ("@OpenCV_FOUND@")
+    load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR)
+    find_dependency(OpenCV)
+endif()
 
 #
-# Common cmake includes
+# Extra Compile Flags
 #
 
-# Inference Engine Developer Scripts package
-
-find_package(IEDevScripts REQUIRED
-             PATHS "@OpenVINO_MAIN_SOURCE_DIR@/cmake/developer_package"
-             NO_CMAKE_FIND_ROOT_PATH
-             NO_DEFAULT_PATH)
-
 if(NOT MSVC)
     ie_add_compiler_flags(-Wno-error=unused-variable)
     if(CMAKE_COMPILER_IS_GNUCXX)
@@ -57,15 +75,3 @@ endif()
 
 # Don't threat deprecated API warnings as errors in 3rd party apps
 ie_deprecated_no_errors()
-
-# inherit OpenCV from main IE project if enabled
-if (ENABLE_OPENCV)
-    load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR)
-    find_package(OpenCV)
-endif()
-
-# inherit TBB from main IE project if enabled
-if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-    load_cache("${cache_path}" READ_WITH_PREFIX "" TBB_DIR)
-    find_package(TBB)
-endif()

inference-engine/samples/benchmark_app/CMakeLists.txt

@@ -10,4 +10,3 @@ ie_add_sample(NAME benchmark_app
               HEADERS ${HDR}
               DEPENDENCIES format_reader ie_samples_utils
               OPENCV_DEPENDENCIES core)
-

inference-engine/src/inference_engine/CMakeLists.txt

@@ -219,7 +219,7 @@ export(TARGETS ${TARGET_NAME} NAMESPACE IE::
 
 # Export for developer package
 
-ie_developer_export_targets(${TARGET_NAME} ${TARGET_NAME}_plugin_api)
+ie_developer_export_targets(${TARGET_NAME}_plugin_api)
 
 # install TBB
 
@@ -281,8 +281,6 @@ install(EXPORT InferenceEngineTargets
         DESTINATION ${IE_CPACK_IE_DIR}/share
         COMPONENT core_dev)
 
-include(CMakePackageConfigHelpers)
-
 set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph")
 set(IE_INCLUDE_DIR "${PUBLIC_HEADERS_DIR}")
 set(IE_PARALLEL_CMAKE "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake")

ngraph/CMakeLists.txt

@@ -265,7 +265,6 @@ endif()
 add_subdirectory(core)
 
 if (NGRAPH_EXPORT_TARGETS_ENABLE)
-    include(CMakePackageConfigHelpers)
     set(NGRAPH_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/ngraphTargets.cmake")
     export(TARGETS ngraph NAMESPACE ngraph:: FILE "${NGRAPH_TARGETS_FILE}")