File tree Expand file tree Collapse file tree 3 files changed +8
-12
lines changed Expand file tree Collapse file tree 3 files changed +8
-12
lines changed Original file line number Diff line number Diff line change
1
+ set (BUILD_opencv_cnn_3dobj_INIT OFF ) # Must be disabled by default - requires custom build of Caffe.
2
+
1
3
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR} )
2
4
3
5
find_package (Caffe )
8
10
message (STATUS "Caffe: NO" )
9
11
endif ()
10
12
11
- find_package (Protobuf )
13
+ if (NOT BUILD_PROTOBUF )
14
+ find_package (Protobuf )
15
+ endif ()
12
16
if (Protobuf_FOUND )
13
17
message (STATUS "Protobuf: YES" )
14
18
set (HAVE_PROTOBUF 1 )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -79,7 +79,9 @@ add_definitions(-DCNN_NO_SERIALIZATION -DCNN_USE_CAFFE_CONVERTER)
79
79
80
80
# NOTE: In case that proto files already exist,
81
81
# this is not needed anymore.
82
- find_package (Protobuf QUIET )
82
+ if (NOT BUILD_PROTOBUF )
83
+ find_package (Protobuf QUIET )
84
+ endif ()
83
85
84
86
if (NOT ${Protobuf_FOUND} )
85
87
message (STATUS "Module opencv_dnn_modern disabled because Protobuf is not found" )
You can’t perform that action at this time.
0 commit comments