Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 643846 | Differences between
and this patch

Collapse All | Expand All

(-)a/cmake/FindCUDA.cmake (-2 / +58 lines)
Lines 283-289 Link Here
283
#   CUDA_nppc_LIBRARY     -- NVIDIA Performance Primitives lib (core).
283
#   CUDA_nppc_LIBRARY     -- NVIDIA Performance Primitives lib (core).
284
#                            Only available for CUDA version 5.5+.
284
#                            Only available for CUDA version 5.5+.
285
#   CUDA_nppi_LIBRARY     -- NVIDIA Performance Primitives lib (image processing).
285
#   CUDA_nppi_LIBRARY     -- NVIDIA Performance Primitives lib (image processing).
286
#                            Only available for CUDA version 5.5+.
286
#                            Only available for CUDA version 5.5+ and was split up
287
#                            in CUDA version 8.0+ and doesn't exist in combined
288
#                            form in CUDA version 9.0+.
289
#   CUDA_nppial_LIBRARY   -- NVIDIA Performance Primatives library (arithmetic and
290
#                            logical operation functions). Only available for CUDA
291
#                            version 8.0+.
292
#   CUDA_nppicc_LIBRARY   -- NVIDIA Performance Primatives library (color conversion
293
#                            and sampling functions). Only available for CUDA version
294
#                            8.0+.
295
#   CUDA_nppicom_LIBRARY  -- NVIDIA Performance Primatives library (JPEG compression
296
#                            and decompression functions). Only available for CUDA
297
#                            version 8.0+.
298
#   CUDA_nppidei_LIBRARY  -- NVIDIA Performance Primatives library (data exchange and
299
#                            initialization functions). Only available for CUDA
300
#                            version 8.0+.
301
#   CUDA_nppif_LIBRARY    -- NVIDIA Performance Primatives library (filtering and
302
#                            computer vision functions). Only available for CUDA
303
#                            version 8.0+.
304
#   CUDA_nppig_LIBRARY    -- NVIDIA Performance Primatives library (geometry
305
#                            transformation functions). Only available for CUDA
306
#                            version 8.0+.
307
#   CUDA_nppim_LIBRARY    -- NVIDIA Performance Primatives library (morphological
308
#                            operation functions). Only available for CUDA version
309
#                            8.0+.
310
#   CUDA_nppist_LIBRARY   -- NVIDIA Performance Primatives library (statistics and
311
#                            linear transform). Only available for CUDA version
312
#                            8.0+.
313
#   CUDA_nppisu_LIBRARY   -- NVIDIA Performance Primatives library (memory support
314
#                            functions). Only available for CUDA version 8.0+.
315
#   CUDA_nppitc_LIBRARY   -- NVIDIA Performance Primatives library (threshold and
316
#                            compare operation functions). Only available for CUDA
317
#                            version 8.0+.
287
#   CUDA_npps_LIBRARY     -- NVIDIA Performance Primitives lib (signal processing).
318
#   CUDA_npps_LIBRARY     -- NVIDIA Performance Primitives lib (signal processing).
288
#                            Only available for CUDA version 5.5+.
319
#                            Only available for CUDA version 5.5+.
289
#   CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
320
#   CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
Lines 522-527 macro(cuda_unset_include_and_libraries) Link Here
522
  unset(CUDA_npp_LIBRARY CACHE)
553
  unset(CUDA_npp_LIBRARY CACHE)
523
  unset(CUDA_nppc_LIBRARY CACHE)
554
  unset(CUDA_nppc_LIBRARY CACHE)
524
  unset(CUDA_nppi_LIBRARY CACHE)
555
  unset(CUDA_nppi_LIBRARY CACHE)
556
  unset(CUDA_nppial_LIBRARY CACHE)
557
  unset(CUDA_nppicc_LIBRARY CACHE)
558
  unset(CUDA_nppicom_LIBRARY CACHE)
559
  unset(CUDA_nppidei_LIBRARY CACHE)
560
  unset(CUDA_nppif_LIBRARY CACHE)
561
  unset(CUDA_nppig_LIBRARY CACHE)
562
  unset(CUDA_nppim_LIBRARY CACHE)
563
  unset(CUDA_nppist_LIBRARY CACHE)
564
  unset(CUDA_nppisu_LIBRARY CACHE)
565
  unset(CUDA_nppitc_LIBRARY CACHE)
525
  unset(CUDA_npps_LIBRARY CACHE)
566
  unset(CUDA_npps_LIBRARY CACHE)
526
  unset(CUDA_nvcuvenc_LIBRARY CACHE)
567
  unset(CUDA_nvcuvenc_LIBRARY CACHE)
527
  unset(CUDA_nvcuvid_LIBRARY CACHE)
568
  unset(CUDA_nvcuvid_LIBRARY CACHE)
Lines 787-793 if(NOT CUDA_VERSION VERSION_LESS "3.2") Link Here
787
    find_cuda_helper_libs(nvcuvid)
828
    find_cuda_helper_libs(nvcuvid)
788
  endif()
829
  endif()
789
endif()
830
endif()
790
if(CUDA_VERSION VERSION_GREATER "5.0")
831
if(CUDA_VERSION VERSION_GREATER "7.5")
832
  # In CUDA 8.0 NPP was splitted onto 12 separate libraries.
833
  find_cuda_helper_libs(nppc)
834
  find_cuda_helper_libs(nppial)
835
  find_cuda_helper_libs(nppicc)
836
  find_cuda_helper_libs(nppicom)
837
  find_cuda_helper_libs(nppidei)
838
  find_cuda_helper_libs(nppif)
839
  find_cuda_helper_libs(nppig)
840
  find_cuda_helper_libs(nppim)
841
  find_cuda_helper_libs(nppist)
842
  find_cuda_helper_libs(nppisu)
843
  find_cuda_helper_libs(nppitc)
844
  find_cuda_helper_libs(npps)
845
  set(CUDA_npp_LIBRARY "${CUDA_nppc_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};${CUDA_npps_LIBRARY}")
846
elseif(CUDA_VERSION VERSION_GREATER "5.0")
791
  # In CUDA 5.5 NPP was splitted onto 3 separate libraries.
847
  # In CUDA 5.5 NPP was splitted onto 3 separate libraries.
792
  find_cuda_helper_libs(nppc)
848
  find_cuda_helper_libs(nppc)
793
  find_cuda_helper_libs(nppi)
849
  find_cuda_helper_libs(nppi)

Return to bug 643846