mirrors/opencv
2
0 Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-10-09 23:44:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only conflict with packages corresponding to modules that are built

Browse Source
This commit is contained in:
Roman Donchenko authored and Dikay900 committed 2015-09-21 13:44:38 +02:00
1 parent 7749eb5d1f
commit 2eab5eb6c0
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVPackaging.cmake
+4 -2
View File
@@ -112,8 +112,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}")