Moved gflags, preprocessing dependencies to root (openvinotoolkit#6309)

Author: ilya-lavrenov

.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_TESTS)
-    add_subdirectory(tests_deprecated)
-    add_subdirectory(tests)
+if(ENABLE_PYTHON)
+    add_subdirectory(ie_bridges/python)
 endif()
 
 add_subdirectory(tools)
+add_subdirectory(samples)
 
-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()
+if(ENABLE_TESTS)
+    add_subdirectory(tests_deprecated)
+    add_subdirectory(tests)
+endif()
 
-# 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()
+#
+# Coverage
+#
 
-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,36 +114,34 @@ 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"
-                                NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+                                  "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
+                                  INSTALL_DESTINATION share # not used
+                                  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"
-                "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
-                @ONLY)
+                   "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
+                   @ONLY)
 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")