Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Rename Emgu.CV.runtime.windows.cuda to Emgu.runtime.windows.cuda.

pull/348/merge
Canming Huang 5 years ago
parent
67be7edcff
commit
c5dfeac7e8
26 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      CMakeLists.txt
  2. 0
      cmake/Emgu.runtime.windows.cuda.blas.Package.nuspec.in
  3. 0
      cmake/Emgu.runtime.windows.cuda.blas.targets.in
  4. 0
      cmake/Emgu.runtime.windows.cuda.dnn.Package.nuspec.in
  5. 0
      cmake/Emgu.runtime.windows.cuda.dnn.cnn.Package.nuspec.in
  6. 0
      cmake/Emgu.runtime.windows.cuda.dnn.cnn.targets.in
  7. 0
      cmake/Emgu.runtime.windows.cuda.dnn.ops.Package.nuspec.in
  8. 0
      cmake/Emgu.runtime.windows.cuda.dnn.ops.targets.in
  9. 0
      cmake/Emgu.runtime.windows.cuda.dnn.targets.in
  10. 0
      cmake/Emgu.runtime.windows.cuda.fft.Package.nuspec.in
  11. 0
      cmake/Emgu.runtime.windows.cuda.fft.targets.in
  12. 0
      cmake/Emgu.runtime.windows.cuda.npp.Package.nuspec.in
  13. 0
      cmake/Emgu.runtime.windows.cuda.npp.targets.in
  14. 12
      platforms/nuget/CMakeLists.txt
  15. 0
      platforms/nuget/Emgu.runtime.windows.cuda.blas/CMakeLists.txt
  16. 0
      platforms/nuget/Emgu.runtime.windows.cuda.blas/EULA.txt
  17. 0
      platforms/nuget/Emgu.runtime.windows.cuda.cufft/CMakeLists.txt
  18. 0
      platforms/nuget/Emgu.runtime.windows.cuda.cufft/EULA.txt
  19. 0
      platforms/nuget/Emgu.runtime.windows.cuda.dnn.cnn/CMakeLists.txt
  20. 0
      platforms/nuget/Emgu.runtime.windows.cuda.dnn.cnn/NVIDIA_SLA_cuDNN_Support.txt
  21. 0
      platforms/nuget/Emgu.runtime.windows.cuda.dnn.ops/CMakeLists.txt
  22. 0
      platforms/nuget/Emgu.runtime.windows.cuda.dnn.ops/NVIDIA_SLA_cuDNN_Support.txt
  23. 0
      platforms/nuget/Emgu.runtime.windows.cuda.dnn/CMakeLists.txt
  24. 0
      platforms/nuget/Emgu.runtime.windows.cuda.dnn/NVIDIA_SLA_cuDNN_Support.txt
  25. 0
      platforms/nuget/Emgu.runtime.windows.cuda.npp/CMakeLists.txt
  26. 0
      platforms/nuget/Emgu.runtime.windows.cuda.npp/EULA.txt

16
CMakeLists.txt
View File

@ -857,16 +857,16 @@ SET(EMGUCV_NUGET_ID "Emgu.CV")
SET(EMGUCV_BITMAP_NUGET_ID "Emgu.CV.Bitmap")
SET(EMGUCV_UI_NUGET_ID "Emgu.CV.UI")
SET(EMGUCV_WINDOWS_NUGET_ID "${EMGUCV_NUGET_ID}.runtime.windows")
#SET(
SET(EMGU_WINDOWS_NUGET_ID "Emgu.runtime.windows")
IF(WITH_CUDA)
SET(EMGUCV_WINDOWS_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.cuda")
SET(EMGUCV_WINDOWS_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.cuda")
#SET(EMGUCV_NUGET_ID "${EMGUCV_NUGET_ID_BASE}-CUDA")
SET(EMGU_CUDA_BLAS_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.blas")
SET(EMGU_NPP_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.npp")
SET(EMGU_CUFFT_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.cufft")
SET(EMGU_CUDNN_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.dnn")
SET(EMGU_CUDNN_CNN_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.dnn.cnn")
SET(EMGU_CUDNN_OPS_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}.dnn.ops")
SET(EMGU_CUDA_BLAS_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.blas")
SET(EMGU_NPP_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.npp")
SET(EMGU_CUFFT_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.cufft")
SET(EMGU_CUDNN_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.dnn")
SET(EMGU_CUDNN_CNN_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.dnn.cnn")
SET(EMGU_CUDNN_OPS_NUGET_ID "${EMGU_WINDOWS_NUGET_ID}.dnn.ops")
#ELSE()
# SET(EMGUCV_NUGET_ID "${EMGUCV_NUGET_ID_BASE}")
ENDIF()

0
cmake/Emgu.CV.runtime.windows.cuda.blas.Package.nuspec.in → cmake/Emgu.runtime.windows.cuda.blas.Package.nuspec.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.blas.targets.in → cmake/Emgu.runtime.windows.cuda.blas.targets.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.dnn.Package.nuspec.in → cmake/Emgu.runtime.windows.cuda.dnn.Package.nuspec.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.dnn.cnn.Package.nuspec.in → cmake/Emgu.runtime.windows.cuda.dnn.cnn.Package.nuspec.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.dnn.cnn.targets.in → cmake/Emgu.runtime.windows.cuda.dnn.cnn.targets.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.dnn.ops.Package.nuspec.in → cmake/Emgu.runtime.windows.cuda.dnn.ops.Package.nuspec.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.dnn.ops.targets.in → cmake/Emgu.runtime.windows.cuda.dnn.ops.targets.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.dnn.targets.in → cmake/Emgu.runtime.windows.cuda.dnn.targets.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.cufft.Package.nuspec.in → cmake/Emgu.runtime.windows.cuda.fft.Package.nuspec.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.cufft.targets.in → cmake/Emgu.runtime.windows.cuda.fft.targets.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.npp.Package.nuspec.in → cmake/Emgu.runtime.windows.cuda.npp.Package.nuspec.in
View File

0
cmake/Emgu.CV.runtime.windows.cuda.npp.targets.in → cmake/Emgu.runtime.windows.cuda.npp.targets.in
View File

12
platforms/nuget/CMakeLists.txt
View File

@ -2,12 +2,12 @@
# Copyright (C) 2004-2020 by EMGU Corporation. All rights reserved.
# --------------------------------------------------------
ADD_SUBDIRECTORY("Emgu.CV.runtime.windows.cuda.cufft")
ADD_SUBDIRECTORY("Emgu.CV.runtime.windows.cuda.dnn.cnn")
ADD_SUBDIRECTORY("Emgu.CV.runtime.windows.cuda.dnn.ops")
ADD_SUBDIRECTORY("Emgu.CV.runtime.windows.cuda.dnn")
ADD_SUBDIRECTORY("Emgu.CV.runtime.windows.cuda.npp")
ADD_SUBDIRECTORY("Emgu.CV.runtime.windows.cuda.blas")
ADD_SUBDIRECTORY("Emgu.runtime.windows.cuda.cufft")
ADD_SUBDIRECTORY("Emgu.runtime.windows.cuda.dnn")
ADD_SUBDIRECTORY("Emgu.runtime.windows.cuda.dnn.cnn")
ADD_SUBDIRECTORY("Emgu.runtime.windows.cuda.dnn.ops")
ADD_SUBDIRECTORY("Emgu.runtime.windows.cuda.npp")
ADD_SUBDIRECTORY("Emgu.runtime.windows.cuda.blas")
ADD_SUBDIRECTORY("Emgu.CV")
ADD_SUBDIRECTORY("Emgu.CV.Bitmap")

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.blas/CMakeLists.txt → platforms/nuget/Emgu.runtime.windows.cuda.blas/CMakeLists.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.blas/EULA.txt → platforms/nuget/Emgu.runtime.windows.cuda.blas/EULA.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.cufft/CMakeLists.txt → platforms/nuget/Emgu.runtime.windows.cuda.cufft/CMakeLists.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.cufft/EULA.txt → platforms/nuget/Emgu.runtime.windows.cuda.cufft/EULA.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.dnn.cnn/CMakeLists.txt → platforms/nuget/Emgu.runtime.windows.cuda.dnn.cnn/CMakeLists.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.dnn.cnn/NVIDIA_SLA_cuDNN_Support.txt → platforms/nuget/Emgu.runtime.windows.cuda.dnn.cnn/NVIDIA_SLA_cuDNN_Support.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.dnn.ops/CMakeLists.txt → platforms/nuget/Emgu.runtime.windows.cuda.dnn.ops/CMakeLists.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.dnn.ops/NVIDIA_SLA_cuDNN_Support.txt → platforms/nuget/Emgu.runtime.windows.cuda.dnn.ops/NVIDIA_SLA_cuDNN_Support.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.dnn/CMakeLists.txt → platforms/nuget/Emgu.runtime.windows.cuda.dnn/CMakeLists.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.dnn/NVIDIA_SLA_cuDNN_Support.txt → platforms/nuget/Emgu.runtime.windows.cuda.dnn/NVIDIA_SLA_cuDNN_Support.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.npp/CMakeLists.txt → platforms/nuget/Emgu.runtime.windows.cuda.npp/CMakeLists.txt
View File

0
platforms/nuget/Emgu.CV.runtime.windows.cuda.npp/EULA.txt → platforms/nuget/Emgu.runtime.windows.cuda.npp/EULA.txt
View File

Write Preview
Loading…
Cancel
Save