added CUDA_DISABLER preprocessor commands

2012-10-01 22:37:20 +04:00
parent 46874d40df
commit 55b1d7c097
112 changed files with 376 additions and 81 deletions
--- a/modules/gpu/perf/main.cpp
+++ b/modules/gpu/perf/main.cpp
@@ -31,7 +31,7 @@ void printOsInfo()

 void printCudaInfo()
 {
-#ifndef HAVE_CUDA
+#if !defined HAVE_CUDA || defined(CUDA_DISABLER)
    cout << "OpenCV was built without CUDA support \n" << endl;
 #else
    int driver;
@@ -99,7 +99,7 @@ int main(int argc, char** argv)

    int device = cmd.get<int>("device");
    bool cpu   = cmd.has("cpu");
-#ifndef HAVE_CUDA
+#if !defined HAVE_CUDA || defined(CUDA_DISABLER)
    cpu = true;
 #endif