Skip to content

O
opencv
Commit 6531fd14 authored by Tomoaki Teshima's avatar Tomoaki Teshima
Browse files
Options

fix build error on Jetson TK1 

  * guard correctly in header file
  * guard correctly in cmake file
parent c48807c3
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 10 deletions
cmake/FindCUDA.cmake
View file @ 6531fd14
...@@ -787,8 +787,8 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2") ...@@ -787,8 +787,8 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
find_cuda_helper_libs(nvcuvid) find_cuda_helper_libs(nvcuvid)
endif() endif()
endif() endif()
if(CUDA_VERSION VERSION_GREATER "5.0") if(CUDA_VERSION VERSION_GREATER "7.5")
# In CUDA 5.5 NPP was splitted onto 3 separate libraries. # In CUDA 8.0 NPPI was split in to many libraries.
find_cuda_helper_libs(nppc) find_cuda_helper_libs(nppc)
find_cuda_helper_libs(nppial) find_cuda_helper_libs(nppial)
find_cuda_helper_libs(nppicc) find_cuda_helper_libs(nppicc)
...@@ -803,6 +803,12 @@ if(CUDA_VERSION VERSION_GREATER "5.0") ...@@ -803,6 +803,12 @@ if(CUDA_VERSION VERSION_GREATER "5.0")
find_cuda_helper_libs(npps) find_cuda_helper_libs(npps)
set(CUDA_nppi_LIBRARY "${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY}") set(CUDA_nppi_LIBRARY "${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY}")
set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppi_LIBRARY};${CUDA_npps_LIBRARY}") set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppi_LIBRARY};${CUDA_npps_LIBRARY}")
elseif(CUDA_VERSION VERSION_GREATER "5.0")
# In CUDA 5.5 NPP was split in to 3 separate libraries.
find_cuda_helper_libs(nppc)
find_cuda_helper_libs(nppi)
find_cuda_helper_libs(npps)
set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppi_LIBRARY};${CUDA_npps_LIBRARY}")
elseif(NOT CUDA_VERSION VERSION_LESS "4.0") elseif(NOT CUDA_VERSION VERSION_LESS "4.0")
find_cuda_helper_libs(npp) find_cuda_helper_libs(npp)
endif() endif()
......
modules/core/include/opencv2/core/private.cuda.hpp
View file @ 6531fd14
...@@ -58,14 +58,16 @@ ...@@ -58,14 +58,16 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
# include <cuda.h> # include <cuda.h>
# include <cuda_runtime.h> # include <cuda_runtime.h>
# if defined (__GNUC__) # if defined(__CUDACC_VER_MAJOR__) && (8 <= __CUDACC_VER_MAJOR__)
# pragma GCC diagnostic push # if defined (__GNUC__) && !defined(__CUDACC__)
# pragma GCC diagnostic ignored "-Wstrict-aliasing" # pragma GCC diagnostic push
# include <cuda_fp16.h> # pragma GCC diagnostic ignored "-Wstrict-aliasing"
# pragma GCC diagnostic pop # include <cuda_fp16.h>
# else # pragma GCC diagnostic pop
# include <cuda_fp16.h> # else
# endif /* __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) */ # include <cuda_fp16.h>
# endif
# endif // defined(__CUDACC_VER_MAJOR__) && (8 <= __CUDACC_VER_MAJOR__)
# include <npp.h> # include <npp.h>
# include "opencv2/core/cuda_stream_accessor.hpp" # include "opencv2/core/cuda_stream_accessor.hpp"
# include "opencv2/core/cuda/common.hpp" # include "opencv2/core/cuda/common.hpp"
......
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