gpuarithm module fixes

modules/gpuarithm/CMakeLists.txt

@@ -6,12 +6,24 @@ set(the_description "GPU-accelerated Operations on Matrices")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuarithm opencv_core OPTIONAL opencv_gpulegacy opencv_imgproc)
+ocv_add_module(gpuarithm opencv_core OPTIONAL opencv_gpulegacy)
+
+ocv_module_include_directories()
+ocv_glob_module_sources()
+
+set(extra_libs "")
 
 if(HAVE_CUBLAS)
-  CUDA_ADD_CUBLAS_TO_TARGET(${the_module})
+  list(APPEND extra_libs ${CUDA_cublas_LIBRARY})
 endif()
 
 if(HAVE_CUFFT)
-  CUDA_ADD_CUFFT_TO_TARGET(${the_module})
+  list(APPEND extra_libs ${CUDA_cufft_LIBRARY})
 endif()
+
+ocv_create_module(${extra_libs})
+
+ocv_add_precompiled_headers(${the_module})
+
+ocv_add_accuracy_tests(DEPENDS_ON opencv_imgproc)
+ocv_add_perf_tests(DEPENDS_ON opencv_imgproc)

modules/gpuarithm/include/opencv2/gpuarithm.hpp

@@ -43,6 +43,10 @@
 #ifndef __OPENCV_GPUARITHM_HPP__
 #define __OPENCV_GPUARITHM_HPP__
 
+#ifndef __cplusplus
+#  error gpuarithm.hpp header must be compiled as C++
+#endif
+
 #include "opencv2/core/gpumat.hpp"
 
 namespace cv { namespace gpu {
@@ -331,7 +335,6 @@ struct CV_EXPORTS ConvolveBuf
     static Size estimateBlockSize(Size result_size, Size templ_size);
 };
 
-
 //! computes convolution (or cross-correlation) of two images using discrete Fourier transform
 //! supports source images of 32FC1 type only
 //! result matrix will have 32FC1 type