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
abe42192
Commit
abe42192
authored
Jul 22, 2013
by
Roman Donchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop the legacy CMake options.
3.0 seems like an appropriate time to do that.
parent
ef91d7e8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
29 deletions
+0
-29
CMakeLists.txt
CMakeLists.txt
+0
-4
OpenCVLegacyOptions.cmake
cmake/OpenCVLegacyOptions.cmake
+0
-25
No files found.
CMakeLists.txt
View file @
abe42192
...
@@ -220,10 +220,6 @@ OCV_OPTION(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors"
...
@@ -220,10 +220,6 @@ OCV_OPTION(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors"
# ===================================================
# ===================================================
OCV_OPTION
(
CMAKE_VERBOSE
"Verbose mode"
OFF
)
OCV_OPTION
(
CMAKE_VERBOSE
"Verbose mode"
OFF
)
# backward compatibility
# ===================================================
include
(
cmake/OpenCVLegacyOptions.cmake OPTIONAL
)
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Get actual OpenCV version number from sources
# Get actual OpenCV version number from sources
...
...
cmake/OpenCVLegacyOptions.cmake
deleted
100644 → 0
View file @
ef91d7e8
macro
(
ocv_legacy_option old superseded_by
)
if
(
DEFINED
${
old
}
)
if
(
ARGV2
)
set
(
${
superseded_by
}
${${
old
}}
CACHE
${
ARGV2
}
"Set via depricated
${
old
}
"
FORCE
)
else
()
set
(
${
superseded_by
}
${${
old
}}
CACHE BOOL
"Set via depricated
${
old
}
"
FORCE
)
endif
()
unset
(
${
old
}
CACHE
)
endif
()
endmacro
()
ocv_legacy_option
(
BUILD_NEW_PYTHON_SUPPORT BUILD_opencv_python
)
ocv_legacy_option
(
BUILD_JAVA_SUPPORT BUILD_opencv_java
)
ocv_legacy_option
(
WITH_ANDROID_CAMERA BUILD_opencv_androidcamera
)
ocv_legacy_option
(
WITH_VIDEOINPUT WITH_DSHOW
)
if
(
DEFINED OPENCV_BUILD_3RDPARTY_LIBS
)
set
(
BUILD_ZLIB
${
OPENCV_BUILD_3RDPARTY_LIBS
}
CACHE BOOL
"Set via depricated OPENCV_BUILD_3RDPARTY_LIBS"
FORCE
)
set
(
BUILD_TIFF
${
OPENCV_BUILD_3RDPARTY_LIBS
}
CACHE BOOL
"Set via depricated OPENCV_BUILD_3RDPARTY_LIBS"
FORCE
)
set
(
BUILD_JASPER
${
OPENCV_BUILD_3RDPARTY_LIBS
}
CACHE BOOL
"Set via depricated OPENCV_BUILD_3RDPARTY_LIBS"
FORCE
)
set
(
BUILD_JPEG
${
OPENCV_BUILD_3RDPARTY_LIBS
}
CACHE BOOL
"Set via depricated OPENCV_BUILD_3RDPARTY_LIBS"
FORCE
)
set
(
BUILD_PNG
${
OPENCV_BUILD_3RDPARTY_LIBS
}
CACHE BOOL
"Set via depricated OPENCV_BUILD_3RDPARTY_LIBS"
FORCE
)
unset
(
OPENCV_BUILD_3RDPARTY_LIBS CACHE
)
endif
()
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