moved finding CUDA_npp_LIBRARY to OpenCVDetectCUDA.cmake

This commit is contained in:
Vladislav Vinogradov 2012-02-15 06:44:20 +00:00
parent 62591a1d5a
commit 6f7e3434ca
2 changed files with 3 additions and 2 deletions

View File

@ -64,6 +64,9 @@ if(CUDA_FOUND)
message(STATUS "CUDA NVCC target flags: ${CUDA_NVCC_FLAGS}")
unset(CUDA_npp_LIBRARY CACHE)
find_cuda_helper_libs(npp)
macro(OCV_CUDA_COMPILE VAR)
if (BUILD_SHARED_LIBS)
set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -DCVAPI_EXPORTS)

View File

@ -50,8 +50,6 @@ if (HAVE_CUDA)
OCV_CUDA_COMPILE(cuda_objs ${lib_cuda} ${ncv_cuda})
#CUDA_BUILD_CLEAN_TARGET()
unset(CUDA_npp_LIBRARY CACHE)
find_cuda_helper_libs(npp)
set(cuda_link_libs ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
else()
set(lib_cuda "")