Only conflict with packages corresponding to modules that are built

2eab5eb6 · Roman Donchenko · Dikay900 · 7749eb5d · 2eab5eb6
Commit 2eab5eb6 authored Aug 26, 2015 by Roman Donchenko Committed by Dikay900 Sep 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

OpenCVPackaging.cmake cmake/OpenCVPackaging.cmake +4 -2

No files found.
--- a/cmake/OpenCVPackaging.cmake
+++ b/cmake/OpenCVPackaging.cmake
@@ -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}")