Fixes for protobuf

Author: rbsheth

cmake/OpenCVFindLibsGrfmt.cmake

@@ -294,6 +294,7 @@ if(WITH_OPENEXR)
   ocv_clear_vars(HAVE_OPENEXR)
   if(NOT BUILD_OPENEXR)
     ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
+    hunter_add_package(OpenEXR)
     include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
   endif()
 

cmake/OpenCVFindOpenEXR.cmake

@@ -11,8 +11,7 @@
 
 if(NOT OPENCV_SKIP_OPENEXR_FIND_PACKAGE)
   if(HUNTER_ENABLED)
-    hunter_add_package(OpenEXR)
-    find_package(OpenEXR CONFIG QUIET)
+    find_package(OpenEXR CONFIG REQUIRED)
   else()
     find_package(OpenEXR 3 QUIET)
   endif()

cmake/OpenCVFindProtobuf.cmake

@@ -14,6 +14,38 @@ ocv_option(PROTOBUF_UPDATE_FILES "Force rebuilding .proto files (protoc should b
 # - Protobuf_LIBRARY
 # - Protobuf_PROTOC_EXECUTABLE
 
+function(generate_protobuf_files PROTO_FILES_INPUT)
+  set(PROTO_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/Protobuf")
+
+  foreach(PROTO_FILE ${PROTO_FILES_INPUT})
+    get_filename_component(PROTO_FILE_ABSOLUTE ${PROTO_FILE} ABSOLUTE)
+    get_filename_component(PROTO_FILE_BASENAME ${PROTO_FILE} NAME_WE)
+    get_filename_component(PROTO_FILE_DIR ${PROTO_FILE} DIRECTORY)
+
+    set(PB_SRC_OUT "${PROTO_OUTPUT_DIR}/${PROTO_FILE_BASENAME}.pb.cc")
+    set(PB_HDR_OUT "${PROTO_OUTPUT_DIR}/${PROTO_FILE_BASENAME}.pb.h")
+
+    list(APPEND fw_srcs "${PB_SRC_OUT}")
+    list(APPEND fw_hdrs "${PB_HDR_OUT}")
+
+    message("adding custom command for Generating ${PROTO_FILE_BASENAME}.pb.h/cc from ${PROTO_FILE}")
+
+    add_custom_command(
+      OUTPUT ${PB_SRC_OUT} ${PB_HDR_OUT}
+      COMMAND protobuf::protoc --cpp_out "${PROTO_OUTPUT_DIR}" -I ${PROTO_FILE_DIR} ${PROTO_FILE_ABSOLUTE}
+      COMMENT "Generating ${PROTO_FILE_BASENAME}.pb.h/cc from ${PROTO_FILE}"
+      DEPENDS ${PROTO_FILE}
+      VERBATIM
+    )
+  endforeach()
+
+  if(NOT EXISTS "${PROTO_OUTPUT_DIR}")
+    file(MAKE_DIRECTORY "${PROTO_OUTPUT_DIR}")
+  endif()
+
+  set(fw_srcs "${fw_srcs}" PARENT_SCOPE)
+  set(fw_hdrs "${fw_hdrs}" PARENT_SCOPE)
+endfunction()
 
 function(get_protobuf_version version include)
   file(STRINGS "${include}/google/protobuf/stubs/common.h" ver REGEX "#define GOOGLE_PROTOBUF_VERSION [0-9]+")
@@ -31,6 +63,19 @@ if(BUILD_PROTOBUF)
   set(HAVE_PROTOBUF TRUE)
 else()
   unset(Protobuf_VERSION CACHE)
+
+  if(IOS OR ANDROID)
+    # add cmake/host subdiretcory as host project to install protoc
+    include(hunter_experimental_add_host_project)
+    hunter_experimental_add_host_project("${OpenCV_SOURCE_DIR}/cmake/protobuf-host")
+
+    add_executable(protobuf::protoc IMPORTED)
+    set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+    set_target_properties(protobuf::protoc PROPERTIES IMPORTED_LOCATION_RELEASE "${HUNTER_HOST_ROOT}/bin/protoc")
+
+    message(STATUS "Using imported protoc from host: ${HUNTER_HOST_ROOT}/bin/protoc")
+  endif(IOS OR ANDROID)
+
   hunter_add_package(Protobuf)
   find_package(Protobuf CONFIG REQUIRED)
 
@@ -68,14 +113,13 @@ else()
   endif()
 endif()
 
-if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP)
-  # message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})")
-  hunter_add_package(Protobuf)
-  find_package(Protobuf CONFIG REQUIRED)
-  if(NOT COMMAND PROTOBUF_GENERATE_CPP)
-    message(FATAL_ERROR "PROTOBUF_GENERATE_CPP command is not available")
-  endif()
-endif()
+# if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP)
+#   message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})")
+
+#   if(NOT COMMAND PROTOBUF_GENERATE_CPP)
+#     message(FATAL_ERROR "PROTOBUF_GENERATE_CPP command is not available")
+#   endif()
+# endif()
 
 if(HAVE_PROTOBUF)
   list(APPEND CUSTOM_STATUS protobuf)

cmake/protobuf-host/CMakeLists.txt

@@ -0,0 +1,11 @@
+# CMake project to install protobuf::protoc from hunter Protobuf package
+cmake_minimum_required(VERSION 3.0)
+
+# Emulate HunterGate:
+# * https://github.com/hunter-packages/gate
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../gate/cmake/HunterGate.cmake)
+HunterGate(URL "${HUNTER_HOST_URL}" SHA1 "${HUNTER_HOST_SHA1}")
+
+project(download-Protobuf-host)
+
+hunter_add_package(Protobuf)

modules/dnn/CMakeLists.txt

@@ -105,7 +105,12 @@ set(libs "")
 if(PROTOBUF_UPDATE_FILES)
   file(GLOB proto_files "${CMAKE_CURRENT_LIST_DIR}/src/tensorflow/*.proto" "${CMAKE_CURRENT_LIST_DIR}/src/caffe/opencv-caffe.proto" "${CMAKE_CURRENT_LIST_DIR}/src/onnx/opencv-onnx.proto")
   set(PROTOBUF_GENERATE_CPP_APPEND_PATH ON) # required for tensorflow
-  protobuf_generate_cpp(fw_srcs fw_hdrs ${proto_files})
+  # protobuf_generate_cpp(fw_srcs fw_hdrs ${proto_files})
+  set(fw_srcs "")
+  set(fw_hdrs "")
+  generate_protobuf_files("${proto_files}")
+
+  list(APPEND include_dirs "${CMAKE_CURRENT_BINARY_DIR}/Protobuf")
 else()
   file(GLOB fw_srcs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.cc")
   file(GLOB fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.h" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.h" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.h")