Commit 7749eb5d authored by Roman Donchenko's avatar Roman Donchenko Committed by Dikay900

Add missing packages to the Debian conflict list

And refactor the code to make sure that the dev and runtime package lists are
in sync.
parent bd5a222d
...@@ -107,15 +107,14 @@ if(HAVE_TBB AND NOT BUILD_TBB) ...@@ -107,15 +107,14 @@ if(HAVE_TBB AND NOT BUILD_TBB)
endif() endif()
endif() endif()
set(STD_OPENCV_LIBS opencv-data libopencv-calib3d2.4 libopencv-contrib2.4 libopencv-core2.4 set(STD_OPENCV_LIBS opencv-data)
libopencv-features2d2.4 libopencv-flann2.4 libopencv-gpu2.4 libopencv-imgproc2.4 set(STD_OPENCV_DEV libopencv-dev)
libopencv-ml2.4 libopencv-ocl2.4 libopencv-stitching2.4 libopencv-ts2.4 libopencv-videostab2.4)
foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy
set(STD_OPENCV_DEV libopencv-calib3d-dev libopencv-contrib-dev libopencv-core-dev ml objdetect ocl photo stitching superres ts video videostab)
libopencv-dev libopencv-features2d-dev libopencv-flann-dev libopencv-gpu-dev list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4")
libopencv-highgui-dev libopencv-imgproc-dev libopencv-legacy-dev libopencv-ml-dev list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")
libopencv-objdetect-dev libopencv-ocl-dev libopencv-photo-dev libopencv-stitching-dev endforeach()
libopencv-superres-dev libopencv-ts-dev libopencv-video-dev libopencv-videostab-dev)
string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_CONFLICTS "${STD_OPENCV_LIBS}") string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_CONFLICTS "${STD_OPENCV_LIBS}")
string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_PROVIDES "${STD_OPENCV_LIBS}") string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_PROVIDES "${STD_OPENCV_LIBS}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment