File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ if(NOT WITH_PROTOBUF)
6
6
return ()
7
7
endif ()
8
8
9
- ocv_option (BUILD_PROTOBUF "Force to build libprotobuf from sources" ON )
10
- ocv_option (PROTOBUF_UPDATE_FILES "Force rebuilding .proto files (protoc should be available)" OFF )
9
+ ocv_option (BUILD_PROTOBUF "Force to build libprotobuf from sources" OFF )
10
+ ocv_option (PROTOBUF_UPDATE_FILES "Force rebuilding .proto files (protoc should be available)" ON )
11
11
12
12
function (get_protobuf_version version include )
13
13
file (STRINGS "${include} /google/protobuf/stubs/common.h" ver REGEX "#define GOOGLE_PROTOBUF_VERSION [0-9]+" )
@@ -23,6 +23,7 @@ if(BUILD_PROTOBUF)
23
23
set (HAVE_PROTOBUF TRUE )
24
24
else ()
25
25
unset (Protobuf_VERSION CACHE )
26
+ hunter_add_package (Protobuf )
26
27
find_package (Protobuf QUIET )
27
28
28
29
# Backwards compatibility
62
63
endif ()
63
64
64
65
if (HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP )
66
+ hunter_add_package (Protobuf )
65
67
find_package (Protobuf QUIET )
66
68
if (NOT COMMAND PROTOBUF_GENERATE_CPP )
67
69
message (FATAL_ERROR "PROTOBUF_GENERATE_CPP command is not available" )
Original file line number Diff line number Diff line change 89
89
set (__lapack_libraries ${LAPACK_LIBRARIES} )
90
90
endif ()
91
91
92
- set (libs libprotobuf ${LAPACK_LIBRARIES} )
92
+ set (libs protobuf:: libprotobuf ${LAPACK_LIBRARIES} )
93
93
94
94
if (OPENCV_DNN_OPENCL AND HAVE_OPENCL )
95
95
list (APPEND include_dirs ${OPENCL_INCLUDE_DIRS} )
You can’t perform that action at this time.
0 commit comments