mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-28 08:06:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: add OPENCV_ENABLE_NONFREE option and macro

Browse Source
This commit is contained in:
Alexander Alekhin 2016-08-04 19:23:49 +03:00
parent 35d0a45df6
commit 18e7afdfd9
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -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
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("")

4
cmake/templates/opencv_modules.hpp.in
View File

@ -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@

2
modules/core/include/opencv2/core/base.hpp
View File

@ -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>