fixed build for CARMA:

* added CMake toolchain file * added WITH_NVCUVID flag
2012-12-20 16:19:14 +04:00
parent 11293d071f
commit 2f1ca1b6b3
21 changed files with 127 additions and 111 deletions
--- a/modules/gpu/src/cuvid_video_source.cpp
+++ b/modules/gpu/src/cuvid_video_source.cpp
@@ -1,7 +1,7 @@
 #include "cuvid_video_source.h"
 #include "cu_safe_call.h"

-#if defined(HAVE_CUDA) && !defined(__APPLE__)
+#if defined(HAVE_CUDA) && defined(HAVE_NVCUVID)

 cv::gpu::detail::CuvidVideoSource::CuvidVideoSource(const std::string& fname)
 {