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
5f2074d7
Unverified
Commit
5f2074d7
authored
Nov 12, 2018
by
Alexander Alekhin
Committed by
GitHub
Nov 12, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13140 from alalek:opencv3_opencv4
parents
2a9c81eb
27fd913c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
OpenCVGenSetupVars.cmake
cmake/OpenCVGenSetupVars.cmake
+1
-1
OpenCVPackaging.cmake
cmake/OpenCVPackaging.cmake
+4
-4
No files found.
cmake/OpenCVGenSetupVars.cmake
View file @
5f2074d7
...
...
@@ -15,7 +15,7 @@ endif()
if
(
INSTALL_TO_MANGLED_PATHS
)
ocv_update
(
OPENCV_SETUPVARS_FILENAME
"setup_vars_opencv-
${
OPENCV_VERSION
}${
OPENCV_SCRIPT_EXTENSION
}
"
)
else
()
ocv_update
(
OPENCV_SETUPVARS_FILENAME setup_vars_opencv
3
${
OPENCV_SCRIPT_EXTENSION
}
)
ocv_update
(
OPENCV_SETUPVARS_FILENAME setup_vars_opencv
4
${
OPENCV_SCRIPT_EXTENSION
}
)
endif
()
##### build directory
...
...
cmake/OpenCVPackaging.cmake
View file @
5f2074d7
...
...
@@ -123,7 +123,7 @@ foreach(module calib3d core cudaarithm cudabgsegm cudacodec cudafeatures2d cudaf
cudev features2d flann hal highgui imgcodecs imgproc ml objdetect ocl
photo shape stitching superres ts video videoio videostab viz
)
if
(
HAVE_opencv_
${
module
}
)
list
(
APPEND STD_OPENCV_LIBS
"libopencv-
${
module
}
3
.0"
)
list
(
APPEND STD_OPENCV_LIBS
"libopencv-
${
module
}
4
.0"
)
list
(
APPEND STD_OPENCV_DEV
"libopencv-
${
module
}
-dev"
)
endif
()
endforeach
()
...
...
@@ -140,9 +140,9 @@ set(CPACK_COMPONENT_PYTHON_CONFLICTS python-opencv)
set
(
CPACK_COMPONENT_PYTHON_PROVIDES python-opencv
)
set
(
CPACK_COMPONENT_PYTHON_REPLACES python-opencv
)
set
(
CPACK_COMPONENT_JAVA_CONFLICTS
"libopencv
3.0-java, libopencv3
.0-jni"
)
set
(
CPACK_COMPONENT_JAVA_PROVIDES
"libopencv
3.0-java, libopencv3
.0-jni"
)
set
(
CPACK_COMPONENT_JAVA_REPLACES
"libopencv
3.0-java, libopencv3
.0-jni"
)
set
(
CPACK_COMPONENT_JAVA_CONFLICTS
"libopencv
4.0-java, libopencv4
.0-jni"
)
set
(
CPACK_COMPONENT_JAVA_PROVIDES
"libopencv
4.0-java, libopencv4
.0-jni"
)
set
(
CPACK_COMPONENT_JAVA_REPLACES
"libopencv
4.0-java, libopencv4
.0-jni"
)
set
(
CPACK_COMPONENT_DOCS_CONFLICTS opencv-doc
)
set
(
CPACK_COMPONENT_SAMPLES_CONFLICTS opencv-doc
)
...
...
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