added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.

pull/13383/head
Vadim Pisarevsky 13 years ago
parent 1c616f43ba
commit 5c615ec28f
  1. 2
      modules/stitching/CMakeLists.txt
  2. 6
      modules/stitching/src/matchers.cpp

@ -1,3 +1,3 @@
set(the_description "Images stitching")
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu)
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu opencv_nonfree)

@ -50,6 +50,12 @@ using namespace cv::detail;
using namespace cv::gpu;
#endif
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/nonfree.hpp"
static bool makeUseOfNonfree = initModule_nonfree();
#endif
namespace {
struct DistIdxPair

Loading…
Cancel
Save