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
19e79d67
Commit
19e79d67
authored
May 27, 2016
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6596 from asmorkalov:g++5_abi
parents
2124cb11
a8b2b4db
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
7 deletions
+14
-7
OpenCVPackaging.cmake
cmake/OpenCVPackaging.cmake
+14
-7
No files found.
cmake/OpenCVPackaging.cmake
View file @
19e79d67
...
@@ -98,15 +98,15 @@ if(HAVE_CUDA)
...
@@ -98,15 +98,15 @@ if(HAVE_CUDA)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"cuda-core-libs-
${
cuda_version_suffix
}
, cuda-extra-libs-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"cuda-core-libs-
${
cuda_version_suffix
}
, cuda-extra-libs-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"cuda-headers-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"cuda-headers-
${
cuda_version_suffix
}
"
)
else
()
else
()
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"cuda-cudart-
${
cuda_version_suffix
}
, cuda-npp-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"cuda-cudart-
${
cuda_version_suffix
}
| libcudart
${
CUDA_VERSION
}
, cuda-npp-
${
cuda_version_suffix
}
| libnppc
${
CUDA_VERSION
}
, cuda-npp-
${
cuda_version_suffix
}
| libnppi
${
CUDA_VERSION
}
, cuda-npp-
${
cuda_version_suffix
}
| libnpps
${
CUDA_VERSION
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"cuda-cudart-dev-
${
cuda_version_suffix
}
, cuda-npp-dev-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"cuda-cudart-dev-
${
cuda_version_suffix
}
| nvidia-cuda-dev (>=
${
CUDA_VERSION
}
), cuda-npp-dev-
${
cuda_version_suffix
}
| nvidia-cuda-dev (>=
${
CUDA_VERSION
}
)
"
)
if
(
HAVE_CUFFT
)
if
(
HAVE_CUFFT
)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"
${
CPACK_DEB_LIBS_PACKAGE_DEPENDS
}
, cuda-cufft-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"
${
CPACK_DEB_LIBS_PACKAGE_DEPENDS
}
, cuda-cufft-
${
cuda_version_suffix
}
| libcufft
${
CUDA_VERSION
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"
${
CPACK_DEB_DEV_PACKAGE_DEPENDS
}
, cuda-cufft-dev-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"
${
CPACK_DEB_DEV_PACKAGE_DEPENDS
}
, cuda-cufft-dev-
${
cuda_version_suffix
}
| nvidia-cuda-dev (>=
${
CUDA_VERSION
}
)
"
)
endif
()
endif
()
if
(
HAVE_HAVE_CUBLAS
)
if
(
HAVE_HAVE_CUBLAS
)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"
${
CPACK_DEB_LIBS_PACKAGE_DEPENDS
}
, cuda-cublas-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_LIBS_PACKAGE_DEPENDS
"
${
CPACK_DEB_LIBS_PACKAGE_DEPENDS
}
, cuda-cublas-
${
cuda_version_suffix
}
| libcublas
${
CUDA_VERSION
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"
${
CPACK_DEB_DEV_PACKAGE_DEPENDS
}
, cuda-cublas-dev-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_DEV_PACKAGE_DEPENDS
"
${
CPACK_DEB_DEV_PACKAGE_DEPENDS
}
, cuda-cublas-dev-
${
cuda_version_suffix
}
| nvidia-cuda-dev (>=
${
CUDA_VERSION
}
)
"
)
endif
()
endif
()
endif
()
endif
()
endif
()
endif
()
...
@@ -122,10 +122,17 @@ endif()
...
@@ -122,10 +122,17 @@ endif()
set
(
STD_OPENCV_LIBS opencv-data
)
set
(
STD_OPENCV_LIBS opencv-data
)
set
(
STD_OPENCV_DEV libopencv-dev
)
set
(
STD_OPENCV_DEV libopencv-dev
)
set
(
ABI_VERSION_SUFFIX
""
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
if
(
${
CMAKE_OPENCV_GCC_VERSION_MAJOR
}
EQUAL 5
)
set
(
ABI_VERSION_SUFFIX
"v5"
)
endif
()
endif
()
foreach
(
module calib3d contrib core features2d flann gpu highgui imgproc legacy
foreach
(
module calib3d contrib core features2d flann gpu highgui imgproc legacy
ml objdetect ocl photo stitching superres ts video videostab
)
ml objdetect ocl photo stitching superres ts video videostab
)
if
(
HAVE_opencv_
${
module
}
)
if
(
HAVE_opencv_
${
module
}
)
list
(
APPEND STD_OPENCV_LIBS
"libopencv-
${
module
}
2.4"
)
list
(
APPEND STD_OPENCV_LIBS
"libopencv-
${
module
}
2.4
${
ABI_VERSION_SUFFIX
}
"
)
list
(
APPEND STD_OPENCV_DEV
"libopencv-
${
module
}
-dev"
)
list
(
APPEND STD_OPENCV_DEV
"libopencv-
${
module
}
-dev"
)
endif
()
endif
()
endforeach
()
endforeach
()
...
...
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