Commit 5b5815d8 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

Merge pull request #893 from jet47:gpu-arm-fixes

parents f527b6a9 ff28bf83
...@@ -17,12 +17,21 @@ using namespace std; ...@@ -17,12 +17,21 @@ using namespace std;
using namespace cv; using namespace cv;
#if !defined(HAVE_CUDA) #if !defined(HAVE_CUDA) || defined(__arm__)
int main( int, const char** ) int main( int, const char** )
{ {
cout << "Please compile the library with CUDA support" << endl; #if !defined(HAVE_CUDA)
return -1; 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 #else
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"
#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__)
int main() int main()
{ {
...@@ -23,6 +23,10 @@ int main() ...@@ -23,6 +23,10 @@ int main()
std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n"; std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n";
#endif #endif
#if defined(__arm__)
std::cout << "Unsupported for ARM CUDA library." << std::endl;
#endif
return 0; return 0;
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"
#if !defined(HAVE_CUDA) || !defined(HAVE_TBB) #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) || defined(__arm__)
int main() int main()
{ {
...@@ -25,6 +25,10 @@ int main() ...@@ -25,6 +25,10 @@ int main()
std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n"; std::cout << "TBB support is required (CMake key 'WITH_TBB' must be true).\n";
#endif #endif
#if defined(__arm__)
std::cout << "Unsupported for ARM CUDA library." << std::endl;
#endif
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment