Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
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
Commits
677dc802
Commit
677dc802
authored
7 years ago
by
Alexander Enaldiev
Committed by
Alexander Alekhin
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
protobuf build documenting: move the WITH_PROTOBUF option to the top level
parent
331af82e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
CMakeLists.txt
+1
-0
OpenCVFindProtobuf.cmake
cmake/OpenCVFindProtobuf.cmake
+3
-4
No files found.
CMakeLists.txt
View file @
677dc802
...
@@ -279,6 +279,7 @@ OCV_OPTION(WITH_GDAL "Include GDAL Support" OFF
...
@@ -279,6 +279,7 @@ OCV_OPTION(WITH_GDAL "Include GDAL Support" OFF
OCV_OPTION
(
WITH_GPHOTO2
"Include gPhoto2 library support"
ON
IF
(
UNIX AND NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_GPHOTO2
"Include gPhoto2 library support"
ON
IF
(
UNIX AND NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_LAPACK
"Include Lapack library support"
(
NOT CV_DISABLE_OPTIMIZATION
)
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_LAPACK
"Include Lapack library support"
(
NOT CV_DISABLE_OPTIMIZATION
)
IF
(
NOT ANDROID AND NOT IOS
)
)
OCV_OPTION
(
WITH_ITT
"Include Intel ITT support"
ON
IF
(
NOT APPLE_FRAMEWORK
)
)
OCV_OPTION
(
WITH_ITT
"Include Intel ITT support"
ON
IF
(
NOT APPLE_FRAMEWORK
)
)
OCV_OPTION
(
WITH_PROTOBUF
"Enable libprotobuf"
ON
)
# OpenCV build components
# OpenCV build components
# ===================================================
# ===================================================
...
...
This diff is collapsed.
Click to expand it.
cmake/OpenCVFindProtobuf.cmake
View file @
677dc802
# If protobuf is found - libprotobuf target is available
# If protobuf is found - libprotobuf target is available
ocv_option
(
WITH_PROTOBUF
"Enable libprotobuf"
ON
)
ocv_option
(
BUILD_PROTOBUF
"Force to build libprotobuf from sources"
ON
)
ocv_option
(
PROTOBUF_UPDATE_FILES
"Force rebuilding .proto files (protoc should be available)"
OFF
)
set
(
HAVE_PROTOBUF FALSE
)
set
(
HAVE_PROTOBUF FALSE
)
if
(
NOT WITH_PROTOBUF
)
if
(
NOT WITH_PROTOBUF
)
return
()
return
()
endif
()
endif
()
ocv_option
(
BUILD_PROTOBUF
"Force to build libprotobuf from sources"
ON
)
ocv_option
(
PROTOBUF_UPDATE_FILES
"Force rebuilding .proto files (protoc should be available)"
OFF
)
function
(
get_protobuf_version version include
)
function
(
get_protobuf_version version include
)
file
(
STRINGS
"
${
include
}
/google/protobuf/stubs/common.h"
ver REGEX
"#define GOOGLE_PROTOBUF_VERSION [0-9]+"
)
file
(
STRINGS
"
${
include
}
/google/protobuf/stubs/common.h"
ver REGEX
"#define GOOGLE_PROTOBUF_VERSION [0-9]+"
)
string
(
REGEX MATCHALL
"[0-9]+"
ver
${
ver
}
)
string
(
REGEX MATCHALL
"[0-9]+"
ver
${
ver
}
)
...
...
This diff is collapsed.
Click to expand it.
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