Merge branch 'gpu-tests'

2012-08-20 11:29:40 +04:00
parent e7f4dd1a2e ec7f9566e0
commit 3956e42507
57 changed files with 5056 additions and 7741 deletions
--- a/modules/gpu/test/test_objdetect.cpp
+++ b/modules/gpu/test/test_objdetect.cpp
@@ -39,8 +39,9 @@
 //
 //M*/

-#include "precomp.hpp"
-#include <string>
+#include "test_precomp.hpp"
+
+#ifdef HAVE_CUDA

 namespace {

@@ -373,3 +374,5 @@ INSTANTIATE_TEST_CASE_P(GPU_ObjDetect, LBP_classify,
                        testing::Combine(ALL_DEVICES, testing::Values<int>(0)));

 } // namespace
+
+#endif // HAVE_CUDA