Merge branch '2.4'

modules/nonfree/perf/perf_precomp.hpp

@@ -13,6 +13,15 @@
 #include "opencv2/nonfree.hpp"
 #include "opencv2/highgui.hpp"
 
+#include "opencv2/opencv_modules.hpp"
+#ifdef HAVE_OPENCV_OCL
+#  include "opencv2/nonfree/ocl.hpp"
+#endif
+
+#if defined(HAVE_OPENCV_GPU) && defined(HAVE_CUDA)
+    #include "opencv2/nonfree/gpu.hpp"
+#endif
+
 #ifdef GTEST_CREATE_SHARED_LIBRARY
 #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
 #endif