mirror of
https://github.com/opencv/opencv.git
synced 2024-11-26 20:20:20 +08:00
Only conflict with packages corresponding to modules that are built
This commit is contained in:
parent
6613d14261
commit
d122510c4f
@ -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}")
|
||||
|
Loading…
Reference in New Issue
Block a user