Merge pull request #975 from SpecLad:merge-2.4

2013-06-11 17:28:26 +04:00
parent 81c6b46fc6 3bfc69740b
commit 7c4e3715b3
31 changed files with 435 additions and 444 deletions
--- a/samples/gpu/driver_api_stereo_multi.cpp
+++ b/samples/gpu/driver_api_stereo_multi.cpp
@@ -25,7 +25,7 @@
 #  endif
 #endif

-#if !defined(HAVE_CUDA) || !defined(HAVE_TBB)
+#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__)

 int main()
 {
@@ -37,6 +37,10 @@ int main()
    std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n";
 #endif

+#if defined(__arm__)
+    std::cout << "Unsupported for ARM CUDA library." << std::endl;
+#endif
+
    return 0;
 }