Merge pull request #807 from alalek:cmake_fix_compiler_flags_detection

modules/optflow/src/motempl.cpp

@@ -42,6 +42,7 @@
 #include "precomp.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/hal/hal.hpp"
+#include "opencv2/core/private.hpp"
 #include "opencl_kernels_optflow.hpp"
 
 namespace  cv {
@@ -54,7 +55,7 @@ using std::vector;
 static bool ocl_updateMotionHistory( InputArray _silhouette, InputOutputArray _mhi,
                                      float timestamp, float delbound )
 {
-    ocl::Kernel k("updateMotionHistory", ocl::video::updatemotionhistory_oclsrc);
+    ocl::Kernel k("updateMotionHistory", ocl::optflow::updatemotionhistory_oclsrc);
     if (k.empty())
         return false;
 

modules/saliency/CMakeLists.txt

@@ -2,3 +2,5 @@ set(the_description "Saliency API")
 set(OPENCV_MODULE_IS_PART_OF_WORLD OFF)
 
 ocv_define_module(saliency opencv_imgproc opencv_highgui opencv_features2d WRAP python)
+
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual)

modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp

@@ -253,7 +253,7 @@ namespace
         const double Lr = 1.0 - sigma_r;
         return max(2, static_cast<int>(ceil(Hs * Lr)));
     }
-
+/*
     void ensureSizeIsEnough(int rows, int cols, int type, Mat& m)
     {
         if (m.empty() || m.type() != type || m.data != m.datastart)
@@ -283,7 +283,7 @@ namespace
     {
         ensureSizeIsEnough(size.height, size.width, type, m);
     }
-
+*/
     template <typename T>
     inline void ensureSizeIsEnough(int rows, int cols, Mat_<T>& m)
     {