Skip to content

O
opencv
Commit 4ab27719 authored by Roman Donchenko's avatar Roman Donchenko
Browse files
Options

Only conflict with packages corresponding to modules that are built

parent bef2b271
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
cmake/OpenCVPackaging.cmake
View file @ 4ab27719
...@@ -120,8 +120,10 @@ set(STD_OPENCV_DEV libopencv-dev) ...@@ -120,8 +120,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)
list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4") if(HAVE_opencv_${module})
list(APPEND STD_OPENCV_DEV "libopencv-${module}-dev") list(APPEND STD_OPENCV_LIBS "libopencv-${module}2.4")
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}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment