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

Nuget package improvements.

pull/348/merge
Canming Huang 5 years ago
parent
9dfa07b9ab
commit
fb95fe3e6f
5 changed files with 20 additions and 25 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. 1
      CMakeLists.txt
  2. 8
      cmake/Emgu.CV.runtime.windows.cuda.blas.targets.in
  3. 10
      cmake/Emgu.CV.runtime.windows.cuda.cufft.targets.in
  4. 24
      cmake/Emgu.CV.runtime.windows.cuda.npp.targets.in
  5. 2
      platforms/nuget/Emgu.CV.runtime.uwp/Emgu.CV.runtime.uwp.targets

1
CMakeLists.txt
View File

@ -1237,6 +1237,7 @@ IF(WITH_CUDA)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EMGU_CUDNN_OPS_NUGET_ID}.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/${EMGU_CUDNN_OPS_NUGET_ID}/Package.nuspec)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EMGU_NPP_NUGET_ID}.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/${EMGU_NPP_NUGET_ID}/Package.nuspec)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EMGU_CUDA_BLAS_NUGET_ID}.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/${EMGU_CUDA_BLAS_NUGET_ID}/Package.nuspec)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EMGU_CUDA_BLAS_NUGET_ID}.targets.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/${EMGU_CUDA_BLAS_NUGET_ID}/${EMGU_CUDA_BLAS_NUGET_ID}.targets)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EMGU_CUFFT_NUGET_ID}.targets.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/${EMGU_CUFFT_NUGET_ID}/${EMGU_CUFFT_NUGET_ID}.targets)
#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.windows.targets.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/Emgu.CV.runtime.windows/${EMGUCV_WINDOWS_NUGET_ID}.targets)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${EMGU_CUDNN_NUGET_ID}.targets.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/${EMGU_CUDNN_NUGET_ID}/${EMGU_CUDNN_NUGET_ID}.targets)

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

@ -4,12 +4,10 @@
<EmguCudaBlasLinkTarget>Windows runtime</EmguCudaBlasLinkTarget>
<EmguCudaBlasBuildX86 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x86'">True</EmguCudaBlasBuildX86>
<EmguCudaBlasBuildX64 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x64'">True</EmguCudaBlasBuildX64>
<EmguCudaBlasNativeFileX64>$(MSBuildThisFileDirectory)\x64\cublas64_${CUDA_VERSION_NUMERIC_ONLY}.dll</EmguCudaBlasNativeFileX64>
<EmguCudaBlasErrorMessage Condition="'$(EmguCudaBlasBuildX86)'=='True'">X86 or AnyCPU is targeted, but ${EMGU_CUDA_BLAS_NUGET_ID} nuget package do not support 32-bit</EmguCudaBlasErrorMessage>
<EmguCudaBlasDeployMessage Condition="'$(EmguCudaBlasBuildX64)'=='True' AND Exists('$(EmguCudaBlasNativeFileX64)')">$(EmguCudaBlasDeployMessage)x64 </EmguCudaBlasDeployMessage>
<EmguCudaBlasErrorMessage Condition="'$(EmguCudaBlasBuildX64)'=='True' AND !Exists('$(EmguCudaBlasNativeFileX64)')">${EMGU_CUDA_BLAS_NUGET_ID} nuget package do not contain necessary binary for $(EmguCudaBlasLinkTarget). X64 is targeted, but file $(EmguCudaBlasNativeFileX64) is missing.</EmguCudaBlasErrorMessage>
<EmguCudaBlasErrorMessage Condition="'$(EmguCudaBlasBuildX86)'=='True'">X86 or AnyCPU is targeted, but ${EMGU_CUDA_BLAS_NUGET_ID} nuget package do not support 32-bit. PInvoke may fail on Windows X86 platform.</EmguCudaBlasErrorMessage>
<EmguCudaBlasDeployMessage Condition="'$(EmguCudaBlasBuildX64)'=='True'">$(EmguCudaBlasDeployMessage)x64 </EmguCudaBlasDeployMessage>
</PropertyGroup>
<ItemGroup Condition="'$(EmguCudaBlasBuildX64)'=='True' AND Exists('$(EmguCudaBlasNativeFileX64)')">
<ItemGroup Condition="'$(EmguCudaBlasBuildX64)'=='True'">
<None Include="$(MSBuildThisFileDirectory)\x64\*.dll">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

10
cmake/Emgu.CV.runtime.windows.cuda.cufft.targets.in
View File

@ -4,20 +4,18 @@
<EmguCufftLinkTarget>Windows runtime</EmguCufftLinkTarget>
<EmguCufftBuildX86 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x86'">True</EmguCufftBuildX86>
<EmguCufftBuildX64 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x64'">True</EmguCufftBuildX64>
<EmguCufftNativeFileX64>$(MSBuildThisFileDirectory)x64\cufft64_${CUFFT_POSTFIX}.dll</EmguCufftNativeFileX64>
<EmguCufftErrorMessage Condition="'$(EmguCufftBuildX86)'=='True'">X86 or AnyCPU is targeted, but ${EMGU_CUFFT_NUGET_ID} nuget package do not support 32-bit. PInvoke may fail on Windows X86 platform.</EmguCufftErrorMessage>
<EmguCufftDeployMessage Condition="'$(EmguCufftBuildX64)'=='True' AND Exists('$(EmguCufftNativeFileX64)')">$(EmguCufftDeployMessage)x64 </EmguCufftDeployMessage>
<EmguCufftErrorMessage Condition="'$(EmguCufftBuildX64)'=='True' AND !Exists('$(EmguCufftNativeFileX64)')">${EMGU_CUFFT_NUGET_ID} nuget package do not contain necessary binary for $(EmguCufftLinkTarget). X64 is targeted, but file $(EmguCufftNativeFileX64) is missing.</EmguCufftErrorMessage>
<EmguCufftDeployMessage Condition="'$(EmguCufftBuildX64)'=='True'">$(EmguCufftDeployMessage)x64 </EmguCufftDeployMessage>
</PropertyGroup>
<ItemGroup Condition="'$(EmguCufftBuildX64)'=='True' AND Exists('$(EmguCufftNativeFileX64)')">
<ItemGroup Condition="'$(EmguCufftBuildX64)'=='True'">
<None Include="$(MSBuildThisFileDirectory)\x64\*.dll">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Target Name="EmguCufftPackageBuildImports" BeforeTargets="PrepareForBuild">
<Error Text="'$(EmguCufftErrorMessage)'" Condition="'$(EmguCufftErrorMessage)'!=''" />
<Message Text="Emgu Cufft dependency Compiling with $(EmguCufftDeployMessage)binary" Condition="'$(EmguCufftDeployMessage)'!=''" Importance="High" />
<Warning Text="'$(EmguCufftErrorMessage)'" Condition="'$(EmguCufftErrorMessage)'!=''" />
<Message Text="${EMGU_CUFFT_NUGET_ID} nuget package deploying $(EmguCufftDeployMessage)binary" Condition="'$(EmguCufftDeployMessage)'!=''" Importance="High" />
<Message Text="No native binary is deployed by the ${EMGU_CUFFT_NUGET_ID} nuget package." Condition="'$(EmguCufftDeployMessage)'==''" Importance="High" />
</Target>
</Project>

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

@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<EmguCvCudaLinkTarget>Windows Runtime</EmguCvCudaLinkTarget>
<EmguCvCudaBuildX86 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x86'">True</EmguCvCudaBuildX86>
<EmguCvCudaBuildX64 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x64'">True</EmguCvCudaBuildX64>
<EmguCudaNativeFileX64>$(MSBuildThisFileDirectory)\x64\cudart64_${CUDA_VERSION_NUMERIC_ONLY}.dll</EmguCudaNativeFileX64>
<EmguCudaErrorMessage Condition="'$(EmguCvCudaBuildX86)'=='True'">X86 or AnyCPU is targeted, but ${EMGU_NPP_NUGET_ID} nuget package do not support 32-bit</EmguCudaErrorMessage>
<EmguCudaDeployMessage Condition="'$(EmguCvCudaBuildX64)'=='True' AND Exists('$(EmguCudaNativeFileX64)')">$(EmguCudaDeployMessage)x64 </EmguCudaDeployMessage>
<EmguCudaErrorMessage Condition="'$(EmguCvCudaBuildX64)'=='True' AND !Exists('$(EmguCudaNativeFileX64)')">${EMGU_NPP_NUGET_ID} nuget package do not contain necessary binary for $(EmguCvCudaLinkTarget). X64 is targeted, but file $(EmguCudaNativeFileX64) is missing.</EmguCudaErrorMessage>
<EmguCudaNppLinkTarget>Windows runtime</EmguCudaNppLinkTarget>
<EmguCudaNppBuildX86 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x86'">True</EmguCudaNppBuildX86>
<EmguCudaNppBuildX64 Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='x64'">True</EmguCudaNppBuildX64>
<EmguCudaNppErrorMessage Condition="'$(EmguCudaNppBuildX86)'=='True'">X86 or AnyCPU is targeted, but ${EMGU_NPP_NUGET_ID} nuget package do not support 32-bit. PInvoke may fail on Windows X86 platform.</EmguCudaNppErrorMessage>
<EmguCudaNppDeployMessage Condition="'$(EmguCudaNppBuildX64)'=='True'">$(EmguCudaDeployMessage)x64 </EmguCudaNppDeployMessage>
</PropertyGroup>
<ItemGroup Condition="'$(EmguCvCudaBuildX64)'=='True' AND Exists('$(EmguCudaNativeFileX64)')">
<ItemGroup Condition="'$(EmguCudaNppBuildX64)'=='True'">
<None Include="$(MSBuildThisFileDirectory)\x64\*.dll">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Target Name="EmguCvCudaPackageBuildImports" BeforeTargets="PrepareForBuild">
<Warning Text="'$(EmguCudaErrorMessage)'" Condition="'$(EmguCudaErrorMessage)'!=''" />
<Message Text="${EMGU_NPP_NUGET_ID} nuget package deploying $(EmguCudaDeployMessage)binary." Condition="'$(EmguCudaDeployMessage)'!=''" Importance="High" />
<Message Text="No native binary is deployed by the ${EMGU_NPP_NUGET_ID} nuget package." Condition="'$(EmguCudaDeployMessage)'==''" Importance="High" />
</Target>
<Target Name="EmguCudaNppPackageBuildImports" BeforeTargets="PrepareForBuild">
<Warning Text="'$(EmguCudaNppErrorMessage)'" Condition="'$(EmguCudaNppErrorMessage)'!=''" />
<Message Text="${EMGU_NPP_NUGET_ID} nuget package deploying $(EmguCudaNppDeployMessage)binary." Condition="'$(EmguCudaNppDeployMessage)'!=''" Importance="High" />
<Message Text="No native binary is deployed by the ${EMGU_NPP_NUGET_ID} nuget package." Condition="'$(EmguCudaNppDeployMessage)'==''" Importance="High" />
</Target>
</Project>

2
platforms/nuget/Emgu.CV.runtime.uwp/Emgu.CV.runtime.uwp.targets
View File

@ -17,7 +17,7 @@
<EmguCvDeployMessage Condition="'$(EmguCvBuildUwpArm)'=='True' AND Exists('$(EmguCvNativeFileUwpArm)')">$(EmguCVDeployMessage)UWP_arm </EmguCvDeployMessage>
<EmguCvErrorMessage Condition="'$(EmguCvBuildUwpArm)'=='True' AND !Exists('$(EmguCvNativeFileUwpArm)')">This package do not contain necessary binary for $(EmguCvLinkTarget). UWP Arm is targeted, but file $(EmguCvNativeFileUwpArm) is missing. PInvoke may fail on UWP ARM platform.</EmguCvErrorMessage>
<EmguCvDeployMessage Condition="'$(EmguCvBuildUwpArm64)'=='True' AND Exists('$(EmguCvNativeFileUwpArm64)')">$(EmguCVDeployMessage)UWP_arm64 </EmguCvDeployMessage>
<EmguCvErrorMessage Condition="'$(EmguCvBuildUwpArm64)'=='True' AND !Exists('$(EmguCvNativeFileUwpArm64)')">This package do not contain necessary binary for $(EmguCvLinkTarget). UWP Arm64 is targeted, but file $(EmguCvNativeFileUwpArm64) is missing. PInvoke may fail on UWP X64 platform.</EmguCvErrorMessage>
<EmguCvErrorMessage Condition="'$(EmguCvBuildUwpArm64)'=='True' AND !Exists('$(EmguCvNativeFileUwpArm64)')">This package do not contain necessary binary for $(EmguCvLinkTarget). UWP Arm64 is targeted, but file $(EmguCvNativeFileUwpArm64) is missing. PInvoke may fail on UWP Arm64 platform.</EmguCvErrorMessage>
</PropertyGroup>
<!-- Windows 10 UWP (x86) -->
<ItemGroup Condition="'$(EmguCvBuildUwpX86)'=='True' AND Exists('$(EmguCVNativeFileUwpX86)')">

Write Preview
Loading…
Cancel
Save