Moved gflags, preprocessing dependencies to root (#6309)

.gitmodules

@@ -1,15 +1,7 @@
-[submodule "inference-engine/thirdparty/ade"]
-	path = inference-engine/thirdparty/ade
-	url = https://github.com/opencv/ade.git
-	ignore = dirty
 [submodule "inference-engine/thirdparty/mkl-dnn"]
 	path = inference-engine/thirdparty/mkl-dnn
 	url = https://github.com/openvinotoolkit/oneDNN.git
 	ignore = dirty
-[submodule "inference-engine/samples/thirdparty/gflags"]
-	path = inference-engine/samples/thirdparty/gflags
-	url = https://github.com/gflags/gflags.git
-	ignore = dirty
 [submodule "thirdparty/xbyak"]
 	path = thirdparty/xbyak
 	url = https://github.com/herumi/xbyak.git
@@ -18,6 +10,14 @@
 	path = thirdparty/zlib/zlib
 	url = https://github.com/madler/zlib.git
 	ignore = dirty
+[submodule "thirdparty/ade"]
+	path = thirdparty/ade
+	url = https://github.com/opencv/ade.git
+	ignore = dirty
+[submodule "thirdparty/gflags"]
+	path = thirdparty/gflags
+	url = https://github.com/gflags/gflags.git
+	ignore = dirty
 [submodule "thirdparty/gtest"]
 	path = thirdparty/gtest
 	url = https://github.com/openvinotoolkit/googletest.git

inference-engine/CMakeLists.txt

@@ -13,55 +13,28 @@ include(cmake/features.cmake)
 # resolving dependencies for the project
 include(cmake/dependencies.cmake)
 
-function(ie_developer_export_targets)
-    openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${ARGN})
-endfunction()
-
-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")
-        list(APPEND all_dev_targets ${${component}})
-    endforeach()
-
-    add_custom_target(ie_dev_targets ALL DEPENDS ${all_dev_targets})
-endfunction()
-
 add_subdirectory(thirdparty)
-
 add_subdirectory(src)
-
 add_subdirectory(ie_bridges/c)
 
+if(ENABLE_PYTHON)
+    add_subdirectory(ie_bridges/python)
+endif()
+
+add_subdirectory(tools)
+add_subdirectory(samples)
+
 if(ENABLE_TESTS)
     add_subdirectory(tests_deprecated)
     add_subdirectory(tests)
 endif()
 
-add_subdirectory(tools)
+#
+# Coverage
+#
 
-function(ie_build_samples)
-    # samples should be build with the same flags as from OpenVINO package,
-    # so unset all flags
-    foreach(var CMAKE_CXX_FLAGS CMAKE_C_FLAGS CMAKE_CXX_STANDARD
-                CMAKE_EXE_LINKER_FLAGS CMAKE_POLICY_DEFAULT_CMP0063
-                CMAKE_CXX_VISIBILITY_PRESET CMAKE_C_VISIBILITY_PRESET
-                CMAKE_VISIBILITY_INLINES_HIDDEN CMAKE_POSITION_INDEPENDENT_CODE
-                THREADS_PREFER_PTHREAD_FLAG X86_64 X86 ARM AARCH64 LINUX
-                MINGW64 CMAKE_BUILD_TYPE CMAKE_MACOSX_RPATH)
-        unset(${var})
-    endforeach()
-    include("${IEDevScripts_DIR}/compile_flags/sanitizer.cmake")
-    add_subdirectory(samples)
-endfunction()
-
-# gflags and format_reader targets are kept inside of samples directory and
-# they must be built even if samples build is disabled (required for tests and tools).
-ie_build_samples()
-
-if(ENABLE_PYTHON)
-    add_subdirectory(ie_bridges/python)
+if(ENABLE_COVERAGE)
+    include(cmake/coverage.cmake)
 endif()
 
 #
@@ -70,19 +43,7 @@ endif()
 
 # install C++ samples
 
-ie_cpack_add_component(cpp_samples DEPENDS core)
-
-install(DIRECTORY ../thirdparty/zlib
-        DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp/thirdparty
-        COMPONENT cpp_samples
-        USE_SOURCE_PERMISSIONS
-        PATTERN .clang-format EXCLUDE)
-
-install(DIRECTORY ../thirdparty/cnpy
-        DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp/thirdparty
-        COMPONENT cpp_samples
-        USE_SOURCE_PERMISSIONS
-        PATTERN .clang-format EXCLUDE)
+ie_cpack_add_component(cpp_samples DEPENDS cpp_samples_deps core)
 
 if(UNIX)
     install(DIRECTORY samples/
@@ -142,7 +103,7 @@ endif()
 # Developer package
 #
 
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils)
+openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
 
 # for Template plugin
 if(NGRAPH_INTERPRETER_ENABLE)
@@ -153,12 +114,18 @@ function(ie_generate_dev_package_config)
     # dummy check that OpenCV is here
     find_package(OpenCV QUIET)
 
-    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")
+        list(APPEND all_dev_targets ${${component}})
+    endforeach()
+    add_custom_target(ie_dev_targets ALL DEPENDS ${all_dev_targets})
 
     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"
+                                  PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR"
                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
     configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
@@ -168,21 +135,13 @@ endfunction()
 
 ie_generate_dev_package_config()
 
-#
-# Coverage
-#
-
-if(ENABLE_COVERAGE)
-    include(cmake/coverage.cmake)
-endif()
-
 #
 # Add extra modules
 #
 
 function(register_extra_modules)
     # post export
-    ie_developer_export_targets(inference_engine)
+    openvino_developer_export_targets(COMPONENT inference_engine TARGETS inference_engine)
     openvino_developer_export_targets(COMPONENT ngraph TARGETS ${NGRAPH_LIBRARIES})
 
     set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/build-modules")

inference-engine/samples/CMakeLists.txt

@@ -110,19 +110,17 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
 endif()
 ####################################
 
-set (GFLAGS_IS_SUBPROJECT TRUE)
-set (HAVE_SYS_STAT_H 1)
-set (HAVE_INTTYPES_H 1)
-set (INTTYPES_FORMAT C99)
-set (BUILD_TESTING OFF)
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags" AND
+    NOT DEFINED IE_MAIN_SOURCE_DIR)
     function(add_gflags)
-        if(NOT WIN32)
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-all")
-            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-all")
-        endif()
+        # common gflags settings
+        set(GFLAGS_IS_SUBPROJECT TRUE)
+        set(HAVE_SYS_STAT_H 1)
+        set(HAVE_INTTYPES_H 1)
+        set(INTTYPES_FORMAT C99)
+        set(BUILD_TESTING OFF)
         set(BUILD_SHARED_LIBS OFF)
+
         add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
         set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
     endfunction()
@@ -154,7 +152,7 @@ elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/opencv_c_wrapper")
 endif()
 
 # samples build can be switched off during whole IE build
-if (IE_MAIN_SOURCE_DIR AND NOT ENABLE_SAMPLES)
+if (DEFINED IE_MAIN_SOURCE_DIR AND NOT ENABLE_SAMPLES)
     return()
 endif()
 

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}_plugin_api)
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME}_plugin_api)
 
 # install TBB
 

inference-engine/src/legacy_api/CMakeLists.txt

@@ -75,7 +75,7 @@ set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj
 
 # developer package
 
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
 
 # install
 

inference-engine/src/low_precision_transformations/CMakeLists.txt

@@ -45,7 +45,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 
 # developer package
 
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
 
 # install
 

inference-engine/src/offline_transformations/CMakeLists.txt

@@ -29,4 +29,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 
 # developer package
 
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})

inference-engine/src/preprocessing/CMakeLists.txt

@@ -113,7 +113,7 @@ target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_PREPROC_PLUGIN
                                                       $<TARGET_PROPERTY:inference_engine,INTERFACE_COMPILE_DEFINITIONS>
                                                       $<TARGET_PROPERTY:fluid,INTERFACE_COMPILE_DEFINITIONS>)
 
-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv"
+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ocv_hal,INTERFACE_INCLUDE_DIRECTORIES>
                                                              $<TARGET_PROPERTY:fluid,INTERFACE_INCLUDE_DIRECTORIES>
                                                              $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
 
@@ -178,7 +178,7 @@ set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj ${TARGET_NAME}_s
 
 # developer package
 
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
 
 # install
 

inference-engine/src/snippets/CMakeLists.txt

@@ -48,7 +48,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 
 # developer package
 
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
 
 # install
 

inference-engine/src/transformations/CMakeLists.txt

@@ -45,7 +45,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 
 # developer package
 
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
 
 # install
 

inference-engine/thirdparty/CMakeLists.txt

@@ -62,15 +62,8 @@ else()
     target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
 endif()
 
-add_subdirectory(ade EXCLUDE_FROM_ALL)
-add_subdirectory(fluid/modules/gapi)
-
-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
-
 # developer package
 
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
-
 if (NOT USE_SYSTEM_PUGIXML)
     set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
     openvino_developer_export_targets(COMPONENT openvino_common TARGETS pugixml)

inference-engine/thirdparty/movidius/XLink/CMakeLists.txt

@@ -42,4 +42,4 @@ endif()
 set_property(TARGET ${TARGET_NAME} PROPERTY C_STANDARD 99)
 
 # TODO: remove once all options are migrated
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})

inference-engine/thirdparty/movidius/mvnc/CMakeLists.txt

@@ -72,9 +72,8 @@ if(NOT WIN32)
 endif()
 
 # TODO: remove once all options are migrated
-ie_developer_export_targets(${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
 
 if(ENABLE_TESTS AND ENABLE_MYRIAD_MVNC_TESTS)
     add_subdirectory(tests)
 endif()
-

tests/stress_tests/CMakeLists.txt

@@ -9,24 +9,19 @@ if (CMAKE_BUILD_TYPE STREQUAL "")
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-set (GFLAGS_IS_SUBPROJECT TRUE)
-set (HAVE_SYS_STAT_H 1)
-set (HAVE_INTTYPES_H 1)
-set (INTTYPES_FORMAT C99)
-set (BUILD_TESTING OFF)
-
 find_package(InferenceEngineDeveloperPackage REQUIRED)
 
 set(OpenVINO_MAIN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
 
-if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/samples/thirdparty/gflags")
+if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
     function(add_gflags)
-        if(NOT WIN32)
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-all")
-            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-all")
-        endif()
+        set(GFLAGS_IS_SUBPROJECT TRUE)
+        set(HAVE_SYS_STAT_H 1)
+        set(HAVE_INTTYPES_H 1)
+        set(INTTYPES_FORMAT C99)
+        set(BUILD_TESTING OFF)
         set(BUILD_SHARED_LIBS OFF)
-        add_subdirectory(${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/samples/thirdparty/gflags
+        add_subdirectory(${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags
                          ${CMAKE_CURRENT_BINARY_DIR}/gflags_build
                          EXCLUDE_FROM_ALL)
         set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)

tests/time_tests/CMakeLists.txt

@@ -21,9 +21,6 @@ if (NOT InferenceEngine_FOUND)
     if (NOT InferenceEngine_FOUND)
         # Search OpenVINO Inference Engine via InferenceEngineDeveloperPackage_DIR
         # in order to provide backward compatibility with old OpenVINO packages
-        set (HAVE_SYS_STAT_H 1)
-        set (HAVE_INTTYPES_H 1)
-        set (INTTYPES_FORMAT C99)
         find_package(InferenceEngineDeveloperPackage REQUIRED)
     endif()
 endif()

tests/time_tests/src/timetests_helper/CMakeLists.txt

@@ -8,21 +8,15 @@ file (GLOB SRC *.cpp)
 add_library(${TARGET_NAME} STATIC ${SRC})
 target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_SOURCE_DIR}/include")
 
-set (GFLAGS_IS_SUBPROJECT TRUE)
-set (BUILD_TESTING OFF)
-
-set (HAVE_SYS_STAT_H 1)
-set (HAVE_INTTYPES_H 1)
-set (INTTYPES_FORMAT C99)
-
-if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/samples/thirdparty/gflags")
+if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
     function(add_gflags)
-        if(NOT WIN32)
-            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-all")
-            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-all")
-        endif()
+        set(GFLAGS_IS_SUBPROJECT TRUE)
+        set(HAVE_SYS_STAT_H 1)
+        set(HAVE_INTTYPES_H 1)
+        set(INTTYPES_FORMAT C99)
+        set(BUILD_TESTING OFF)
         set(BUILD_SHARED_LIBS OFF)
-        add_subdirectory(${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/samples/thirdparty/gflags
+        add_subdirectory(${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags
                          ${CMAKE_CURRENT_BINARY_DIR}/gflags_build
                          EXCLUDE_FROM_ALL)
         set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)

thirdparty/CMakeLists.txt

@@ -2,12 +2,50 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+if(ENABLE_LTO)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON)
+endif()
+
 add_subdirectory(ittapi EXCLUDE_FROM_ALL)
 add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
-add_subdirectory(xbyak EXCLUDE_FROM_ALL)
 add_subdirectory(zlib EXCLUDE_FROM_ALL)
 add_subdirectory(cnpy EXCLUDE_FROM_ALL)
 
+add_subdirectory(xbyak EXCLUDE_FROM_ALL)
+openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
+
+#
+# Fluid, G-API, OpenCV HAL
+#
+
+add_library(ocv_hal INTERFACE)
+target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
+
+add_subdirectory(ade EXCLUDE_FROM_ALL)
+add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL)
+set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
+openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
+
+#
+# Gflags
+#
+
+function(add_gflags)
+    # common gflags settings
+    set(GFLAGS_IS_SUBPROJECT TRUE)
+    set(HAVE_SYS_STAT_H 1)
+    set(HAVE_INTTYPES_H 1)
+    set(INTTYPES_FORMAT C99)
+    set(BUILD_TESTING OFF)
+    set(BUILD_SHARED_LIBS OFF)
+
+    add_subdirectory(gflags EXCLUDE_FROM_ALL)
+    set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
+    openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
+endfunction()
+
+add_gflags()
+
 #
 # Google Tests framework
 #
@@ -56,7 +94,22 @@ if(NGRAPH_UNIT_TEST_ENABLE OR ENABLE_TESTS)
 endif()
 
 #
-# Export 3rdparty components
+# Install
 #
 
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
+ie_cpack_add_component(cpp_samples_deps)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gflags
+        DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp/thirdparty
+        COMPONENT cpp_samples_deps
+        USE_SOURCE_PERMISSIONS)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/zlib
+        DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp/thirdparty
+        COMPONENT cpp_samples_deps
+        USE_SOURCE_PERMISSIONS)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cnpy
+        DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp/thirdparty
+        COMPONENT cpp_samples_deps
+        USE_SOURCE_PERMISSIONS)