From 32a4ec156bc9f56ad2520ffbf29b0bb6a71d718b Mon Sep 17 00:00:00 2001 From: Dikay900 Date: Sat, 19 Sep 2015 14:15:40 +0200 Subject: [PATCH] changes to reflect 3.0 status --- cmake/OpenCVPackaging.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cmake/OpenCVPackaging.cmake b/cmake/OpenCVPackaging.cmake index 1574ffa73..21a82a478 100644 --- a/cmake/OpenCVPackaging.cmake +++ b/cmake/OpenCVPackaging.cmake @@ -110,10 +110,12 @@ endif() set(STD_OPENCV_LIBS opencv-data) set(STD_OPENCV_DEV libopencv-dev) -foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy - ml objdetect ocl photo stitching superres ts video videostab) +foreach(module calib3d core cudaarithm cudabgsegm cudacodec cudafeatures2d cudafilters + cudaimgproc cudalegacy cudaobjdetect cudaoptflow cudastereo cudawarping + 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}2.4") + list(APPEND STD_OPENCV_LIBS "libopencv-${module}3.0") list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev") endif() endforeach() @@ -130,9 +132,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 "libopencv2.4-java, libopencv2.4-jni") -set(CPACK_COMPONENT_JAVA_PROVIDES "libopencv2.4-java, libopencv2.4-jni") -set(CPACK_COMPONENT_JAVA_REPLACES "libopencv2.4-java, libopencv2.4-jni") +set(CPACK_COMPONENT_JAVA_CONFLICTS "libopencv3.0-java, libopencv3.0-jni") +set(CPACK_COMPONENT_JAVA_PROVIDES "libopencv3.0-java, libopencv3.0-jni") +set(CPACK_COMPONENT_JAVA_REPLACES "libopencv3.0-java, libopencv3.0-jni") set(CPACK_COMPONENT_DOCS_CONFLICTS opencv-doc) set(CPACK_COMPONENT_SAMPLES_CONFLICTS opencv-doc)