From ff28bf831f156eceba443479fc08aafbe32b1ee6 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 3 Jun 2013 14:01:04 +0400 Subject: [PATCH] disabled samples with driver api --- samples/gpu/cascadeclassifier_nvidia_api.cpp | 15 ++++++++++++--- samples/gpu/driver_api_multi.cpp | 6 +++++- samples/gpu/driver_api_stereo_multi.cpp | 6 +++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/samples/gpu/cascadeclassifier_nvidia_api.cpp b/samples/gpu/cascadeclassifier_nvidia_api.cpp index 99c95ab977..98195b35c2 100644 --- a/samples/gpu/cascadeclassifier_nvidia_api.cpp +++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp @@ -17,12 +17,21 @@ using namespace std; using namespace cv; -#if !defined(HAVE_CUDA) +#if !defined(HAVE_CUDA) || defined(__arm__) + int main( int, const char** ) { - cout << "Please compile the library with CUDA support" << endl; - return -1; +#if !defined(HAVE_CUDA) + std::cout << "CUDA support is required (CMake key 'WITH_CUDA' must be true)." << std::endl; +#endif + +#if defined(__arm__) + std::cout << "Unsupported for ARM CUDA library." << std::endl; +#endif + + return 0; } + #else diff --git a/samples/gpu/driver_api_multi.cpp b/samples/gpu/driver_api_multi.cpp index 2d743f0e9c..c829830e72 100644 --- a/samples/gpu/driver_api_multi.cpp +++ b/samples/gpu/driver_api_multi.cpp @@ -11,7 +11,7 @@ #include "opencv2/core/core.hpp" #include "opencv2/gpu/gpu.hpp" -#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) +#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__) int main() { @@ -23,6 +23,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; } diff --git a/samples/gpu/driver_api_stereo_multi.cpp b/samples/gpu/driver_api_stereo_multi.cpp index 10c3974771..d4d0af451c 100644 --- a/samples/gpu/driver_api_stereo_multi.cpp +++ b/samples/gpu/driver_api_stereo_multi.cpp @@ -13,7 +13,7 @@ #include "opencv2/highgui/highgui.hpp" #include "opencv2/gpu/gpu.hpp" -#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) +#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__) int main() { @@ -25,6 +25,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; }