From 27fd913c869a04865b58e7ddbfdc23510f501f30 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 12 Nov 2018 19:05:58 +0000 Subject: [PATCH] build: fix version 3->4 --- cmake/OpenCVGenSetupVars.cmake | 2 +- cmake/OpenCVPackaging.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/OpenCVGenSetupVars.cmake b/cmake/OpenCVGenSetupVars.cmake index e924317871..23c785f1bb 100644 --- a/cmake/OpenCVGenSetupVars.cmake +++ b/cmake/OpenCVGenSetupVars.cmake @@ -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_opencv3${OPENCV_SCRIPT_EXTENSION}) + ocv_update(OPENCV_SETUPVARS_FILENAME setup_vars_opencv4${OPENCV_SCRIPT_EXTENSION}) endif() ##### build directory diff --git a/cmake/OpenCVPackaging.cmake b/cmake/OpenCVPackaging.cmake index 9b98268b71..5db02e1e59 100644 --- a/cmake/OpenCVPackaging.cmake +++ b/cmake/OpenCVPackaging.cmake @@ -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 "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_JAVA_CONFLICTS "libopencv4.0-java, libopencv4.0-jni") +set(CPACK_COMPONENT_JAVA_PROVIDES "libopencv4.0-java, libopencv4.0-jni") +set(CPACK_COMPONENT_JAVA_REPLACES "libopencv4.0-java, libopencv4.0-jni") set(CPACK_COMPONENT_DOCS_CONFLICTS opencv-doc) set(CPACK_COMPONENT_SAMPLES_CONFLICTS opencv-doc)