Merge pull request #2863 from apavlenko:disable_cuda_stubs_defaults

This commit is contained in:
Andrey Pavlenko
2014-06-18 16:13:13 +04:00
committed by OpenCV Buildbot
11 changed files with 11 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cuda)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudaarithm)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudabgsegm)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS OR APPLE)
if(IOS OR APPLE OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudacodec)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudafeatures2d)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudafilters)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudaimgproc)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudaoptflow)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudastereo)
endif()

View File

@@ -1,4 +1,4 @@
if(IOS)
if(IOS OR (NOT HAVE_CUDA AND NOT BUILD_CUDA_STUBS))
ocv_module_disable(cudawarping)
endif()