Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
bdf51c3a
Commit
bdf51c3a
authored
Oct 18, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix protobuf usage
parent
e9cd99d9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
12 deletions
+8
-12
CMakeLists.txt
modules/cnn_3dobj/CMakeLists.txt
+5
-1
FindProtobuf.cmake
modules/cnn_3dobj/FindProtobuf.cmake
+0
-10
CMakeLists.txt
modules/dnn_modern/CMakeLists.txt
+3
-1
No files found.
modules/cnn_3dobj/CMakeLists.txt
View file @
bdf51c3a
set
(
BUILD_opencv_cnn_3dobj_INIT OFF
)
# Must be disabled by default - requires custom build of Caffe.
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
)
find_package
(
Caffe
)
...
...
@@ -8,7 +10,9 @@ else()
message
(
STATUS
"Caffe: NO"
)
endif
()
find_package
(
Protobuf
)
if
(
NOT BUILD_PROTOBUF
)
find_package
(
Protobuf
)
endif
()
if
(
Protobuf_FOUND
)
message
(
STATUS
"Protobuf: YES"
)
set
(
HAVE_PROTOBUF 1
)
...
...
modules/cnn_3dobj/FindProtobuf.cmake
deleted
100755 → 0
View file @
e9cd99d9
# Protobuf package for CNN Triplet training
unset
(
Protobuf_FOUND
)
find_library
(
Protobuf_LIBS NAMES protobuf
HINTS
/usr/local/lib
)
if
(
Protobuf_LIBS
)
set
(
Protobuf_FOUND 1
)
endif
()
modules/dnn_modern/CMakeLists.txt
View file @
bdf51c3a
...
...
@@ -79,7 +79,9 @@ add_definitions(-DCNN_NO_SERIALIZATION -DCNN_USE_CAFFE_CONVERTER)
# NOTE: In case that proto files already exist,
# this is not needed anymore.
find_package
(
Protobuf QUIET
)
if
(
NOT BUILD_PROTOBUF
)
find_package
(
Protobuf QUIET
)
endif
()
if
(
NOT
${
Protobuf_FOUND
}
)
message
(
STATUS
"Module opencv_dnn_modern disabled because Protobuf is not found"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment