From 8e40becab12c642e7bbafb9fe87698e8b6bf28da Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 23 Oct 2015 12:28:09 +0300 Subject: [PATCH] Debian packages with legacy C headers added to list of conflicts, relpaces, etc. (cherry picked from commit e245aed6bbebd69a63a00d45a66b358df4153888) --- cmake/OpenCVPackaging.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/OpenCVPackaging.cmake b/cmake/OpenCVPackaging.cmake index e64d447bfa..4e4b4d42c9 100644 --- a/cmake/OpenCVPackaging.cmake +++ b/cmake/OpenCVPackaging.cmake @@ -127,6 +127,8 @@ foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy endif() endforeach() +list(APPEND STD_OPENCV_DEV "libhighgui-dev" "libcv-dev" "libcvaux-dev") + string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_CONFLICTS "${STD_OPENCV_LIBS}") string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_PROVIDES "${STD_OPENCV_LIBS}") string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_REPLACES "${STD_OPENCV_LIBS}")