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
18e7afdf
Commit
18e7afdf
authored
Aug 04, 2016
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: add OPENCV_ENABLE_NONFREE option and macro
parent
35d0a45d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
CMakeLists.txt
CMakeLists.txt
+7
-0
opencv_modules.hpp.in
cmake/templates/opencv_modules.hpp.in
+4
-0
base.hpp
modules/core/include/opencv2/core/base.hpp
+2
-0
No files found.
CMakeLists.txt
View file @
18e7afdf
...
@@ -164,6 +164,8 @@ endif()
...
@@ -164,6 +164,8 @@ endif()
# OpenCV cmake options
# OpenCV cmake options
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
OCV_OPTION
(
OPENCV_ENABLE_NONFREE
"Enable non-free algorithms"
OFF
)
# Optional 3rd party components
# Optional 3rd party components
# ===================================================
# ===================================================
OCV_OPTION
(
WITH_1394
"Include IEEE1394 support"
ON
IF
(
NOT ANDROID AND NOT IOS AND NOT WINRT
)
)
OCV_OPTION
(
WITH_1394
"Include IEEE1394 support"
ON
IF
(
NOT ANDROID AND NOT IOS AND NOT WINRT
)
)
...
@@ -914,6 +916,11 @@ status(" Disabled:" OPENCV_MODULES_DISABLED_USER THEN ${OPENCV
...
@@ -914,6 +916,11 @@ status(" Disabled:" OPENCV_MODULES_DISABLED_USER THEN ${OPENCV
status
(
" Disabled by dependency:"
OPENCV_MODULES_DISABLED_AUTO THEN
${
OPENCV_MODULES_DISABLED_AUTO_ST
}
ELSE
"-"
)
status
(
" Disabled by dependency:"
OPENCV_MODULES_DISABLED_AUTO THEN
${
OPENCV_MODULES_DISABLED_AUTO_ST
}
ELSE
"-"
)
status
(
" Unavailable:"
OPENCV_MODULES_DISABLED_FORCE THEN
${
OPENCV_MODULES_DISABLED_FORCE_ST
}
ELSE
"-"
)
status
(
" Unavailable:"
OPENCV_MODULES_DISABLED_FORCE THEN
${
OPENCV_MODULES_DISABLED_FORCE_ST
}
ELSE
"-"
)
if
(
OPENCV_ENABLE_NONFREE
)
status
(
""
)
status
(
" Non-free algorithms are enabled"
)
endif
()
# ========================== Android details ==========================
# ========================== Android details ==========================
if
(
ANDROID
)
if
(
ANDROID
)
status
(
""
)
status
(
""
)
...
...
cmake/templates/opencv_modules.hpp.in
View file @
18e7afdf
...
@@ -6,4 +6,8 @@
...
@@ -6,4 +6,8 @@
*
*
*/
*/
// This definition means that OpenCV is built with enabled non-free code.
// For example, patented algorithms for non-profit/non-commercial use only.
#cmakedefine OPENCV_ENABLE_NONFREE
@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
modules/core/include/opencv2/core/base.hpp
View file @
18e7afdf
...
@@ -49,6 +49,8 @@
...
@@ -49,6 +49,8 @@
# error base.hpp header must be compiled as C++
# error base.hpp header must be compiled as C++
#endif
#endif
#include "opencv2/opencv_modules.hpp"
#include <climits>
#include <climits>
#include <algorithm>
#include <algorithm>
...
...
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