potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

fix build error on Jetson TK1

Browse Source 
* guard correctly in header file
  * guard correctly in cmake file
This commit is contained in:
Tomoaki Teshima
2017-08-29 19:05:13 +09:00
parent c48807c383
commit 6531fd142c
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/private.cuda.hpp
+10 -8
View File
@@ -58,14 +58,16 @@
#ifdef HAVE_CUDA
# include <cuda.h>
# include <cuda_runtime.h>
# if defined (__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wstrict-aliasing"
# include <cuda_fp16.h>
# pragma GCC diagnostic pop
# else
# include <cuda_fp16.h>
# endif /* __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) */
# if defined(__CUDACC_VER_MAJOR__) && (8 <= __CUDACC_VER_MAJOR__)
# if defined (__GNUC__) && !defined(__CUDACC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wstrict-aliasing"
# include <cuda_fp16.h>
# pragma GCC diagnostic pop
# else
# include <cuda_fp16.h>
# endif
# endif // defined(__CUDACC_VER_MAJOR__) && (8 <= __CUDACC_VER_MAJOR__)
# include <npp.h>
# include "opencv2/core/cuda_stream_accessor.hpp"
# include "opencv2/core/cuda/common.hpp"