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

Only conflict with packages corresponding to modules that are built

Browse Source
This commit is contained in:
Roman Donchenko 2015-08-26 13:42:21 +03:00 committed by Dikay900
parent 7749eb5d1f
commit 2eab5eb6c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVPackaging.cmake
View File

@ -112,8 +112,10 @@ set(STD_OPENCV_DEV libopencv-dev)
foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy
ml objdetect ocl photo stitching superres ts video videostab) ml objdetect ocl photo stitching superres ts video videostab)
if(HAVE_opencv_${module})
list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4") list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4")
list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev") list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")
endif()
endforeach() endforeach()
string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_CONFLICTS "${STD_OPENCV_LIBS}") string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_CONFLICTS "${STD_OPENCV_LIBS}")