potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages 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
parent bef2b27155
commit 4ab2771957
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVPackaging.cmake
+4 -2
View File
@@ -120,8 +120,10 @@ set(STD_OPENCV_DEV libopencv-dev)
foreach(module calib3d contrib core features2d flann gpu highgui imgproc legacy
ml objdetect ocl photo stitching superres ts video videostab)
list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4")
list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")
if(HAVE_opencv_${module})
list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4")
list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev")
endif()
endforeach()
string(REPLACE ";" ", " CPACK_COMPONENT_LIBS_CONFLICTS "${STD_OPENCV_LIBS}")