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
8b4b7f6c
Commit
8b4b7f6c
authored
Aug 18, 2016
by
Vitaliy Lyudvichenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminated packed precompiled Caffe protobuf sources
parent
8dcc2610
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
12 deletions
+3
-12
OpenCVFindLibProtobuf.cmake
modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
+3
-12
caffe.pb.cc
modules/dnn/misc/caffe/caffe.pb.cc
+0
-0
caffe.pb.h
modules/dnn/misc/caffe/caffe.pb.h
+0
-0
caffe.tar.gz
modules/dnn/src/caffe/compiled/caffe.tar.gz
+0
-0
No files found.
modules/dnn/cmake/OpenCVFindLibProtobuf.cmake
View file @
8b4b7f6c
...
...
@@ -23,20 +23,11 @@ else()
endif
()
set
(
PROTOBUF_LIBRARIES libprotobuf
)
set
(
PROTOBUF_INCLUDE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/3rdparty/protobuf/src
${
CMAKE_CURRENT_
BINARY_DIR
}
)
set
(
PROTOBUF_SRCS
${
CMAKE_CURRENT_
BINARY_DIR
}
/caffe.pb.cc
)
set
(
PROTOBUF_HDRS
${
CMAKE_CURRENT_
BINARY_DIR
}
/caffe.pb.h
)
set
(
PROTOBUF_INCLUDE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/3rdparty/protobuf/src
${
CMAKE_CURRENT_
SOURCE_DIR
}
/misc/caffe
)
set
(
PROTOBUF_SRCS
${
CMAKE_CURRENT_
SOURCE_DIR
}
/misc/caffe
/caffe.pb.cc
)
set
(
PROTOBUF_HDRS
${
CMAKE_CURRENT_
SOURCE_DIR
}
/misc/caffe
/caffe.pb.h
)
add_definitions
(
-DHAVE_PROTOBUF=1
)
add_custom_command
(
OUTPUT
${
PROTOBUF_SRCS
}
${
PROTOBUF_HDRS
}
COMMAND
${
CMAKE_COMMAND
}
-E tar xzf
${
CMAKE_CURRENT_SOURCE_DIR
}
/src/caffe/compiled/caffe.tar.gz
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
COMMENT
"Unpacking compiled caffe protobuf files"
VERBATIM
)
set_source_files_properties
(
${
PROTOBUF_SRCS
}
${
PROTOBUF_HDRS
}
PROPERTIES GENERATED TRUE
)
#supress warnings in autogenerated caffe.pb.* files
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wunused-parameter
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4125 /wd4267 /wd4127 /wd4244 /wd4512 /wd4702
)
...
...
modules/dnn/misc/caffe/caffe.pb.cc
0 → 100644
View file @
8b4b7f6c
This diff is collapsed.
Click to expand it.
modules/dnn/misc/caffe/caffe.pb.h
0 → 100644
View file @
8b4b7f6c
This diff is collapsed.
Click to expand it.
modules/dnn/src/caffe/compiled/caffe.tar.gz
deleted
100644 → 0
View file @
8dcc2610
File deleted
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