Merge pull request #2339 from jet47:gpu-warnings

2014-02-17 13:35:15 +04:00
parent 7358b44222 8b8c368148
commit e8d26b02ac
4 changed files with 6 additions and 3 deletions
@@ -25,7 +25,7 @@ endif()

 if(HAVE_CUDA)
  ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
+  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wshadow)
 endif()

 file(GLOB lib_cuda_hdrs        "include/opencv2/${name}/cuda/*.hpp"        "include/opencv2/${name}/cuda/*.h")