generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing packages to the Debian conflict list

Browse Source 
And refactor the code to make sure that the dev and runtime package lists are
in sync.
This commit is contained in:
Roman Donchenko 2015-08-25 18:50:06 +03:00
parent 702afcd760
commit bef2b27155
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/OpenCVPackaging.cmake
View File

@ -115,15 +115,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)
set(STD_OPENCV_DEV libopencv-calib3d-dev libopencv-contrib-dev libopencv-core-dev foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy
libopencv-dev libopencv-features2d-dev libopencv-flann-dev libopencv-gpu-dev ml objdetect ocl photo stitching superres ts video videostab)
libopencv-highgui-dev libopencv-imgproc-dev libopencv-legacy-dev libopencv-ml-dev list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4")
libopencv-objdetect-dev libopencv-ocl-dev libopencv-photo-dev libopencv-stitching-dev list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")
libopencv-superres-dev libopencv-ts-dev libopencv-video-dev libopencv-videostab-dev) endforeach()
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}")