fix nonfree module compilation without CUDA

rokon12 · Feb 7, 2014 · 3e1f74f · 3e1f74f
1 parent 34b02f6
commit 3e1f74f
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp
@@ -51,17 +51,14 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/core/internal.hpp"
 
-#if defined(HAVE_OPENCV_GPU) && !defined(DYNAMIC_CUDA_SUPPORT)
-    #include "opencv2/nonfree/gpu.hpp"
+#include "opencv2/nonfree/gpu.hpp"
 
-    #if defined(HAVE_CUDA)
-        #include "opencv2/gpu/stream_accessor.hpp"
-        #include "opencv2/gpu/device/common.hpp"
-
-        static inline void throw_nogpu() { CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform"); }
-    #else
-        static inline void throw_nogpu() { CV_Error(CV_GpuNotSupported, "The library is compiled without GPU support"); }
-    #endif
+#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_GPU) && !defined(DYNAMIC_CUDA_SUPPORT)
+    #include "opencv2/gpu/stream_accessor.hpp"
+    #include "opencv2/gpu/device/common.hpp"
+    static inline void throw_nogpu() { CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform"); }
+#else
+    static inline void throw_nogpu() { CV_Error(CV_GpuNotSupported, "The library is compiled without GPU support"); }
 #endif
 
 #ifdef HAVE_OPENCV_OCL