Browse Source

Fix Emgu.CV.Test.Netcore build on Mac OS

pull/299/head
Canming Huang 6 years ago
parent
commit
d83efb4cb0
  1. 1
      Emgu.CV.Runtime/Mac/Emgu.CV.Runtime.Mac.projitems
  2. 2
      Emgu.CV.Runtime/Windows/Emgu.CV.Runtime.Windows.shproj
  3. 1
      Emgu.CV.Test/Emgu.CV.Test.Netcore/Emgu.CV.Test.Netcore.csproj
  4. 6
      Solution/Windows.Desktop/Emgu.CV.Test.Netcore.sln

1
Emgu.CV.Runtime/Mac/Emgu.CV.Runtime.Mac.projitems

@ -10,7 +10,6 @@
</PropertyGroup>
<PropertyGroup>
<EmguCVMacBinaryDir>$(MSBuildThisFileDirectory)..\..\libs\osx</EmguCVMacBinaryDir>
<EmguCVMacDir>$(MSBuildThisFileDirectory)</EmguCVMacDir>
</PropertyGroup>
<PropertyGroup>
<EmguCVMacLinkTarget>Xamarin.Mac</EmguCVMacLinkTarget>

2
Emgu.CV.Runtime/Windows/Emgu.CV.Runtime.Windows.shproj

@ -8,6 +8,6 @@
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="Emgu.TF.Runtime.Windows.projitems" Label="Shared" />
<Import Project="Emgu.CV.Runtime.Windows.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>

1
Emgu.CV.Test/Emgu.CV.Test.Netcore/Emgu.CV.Test.Netcore.csproj

@ -254,4 +254,5 @@
<ProjectReference Include="..\..\Emgu.CV.World\Netstandard\Emgu.CV.World.Netstandard.csproj" />
</ItemGroup>
<Import Project="..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.projitems" Label="Shared" />
<Import Project="..\..\Emgu.CV.Runtime\Mac\Emgu.CV.Runtime.Mac.projitems" Label="Shared" />
</Project>

6
Solution/Windows.Desktop/Emgu.CV.Test.Netcore.sln

@ -14,10 +14,12 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.Util", "..\..\Emgu.Uti
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emgu.CV.World.Netstandard", "..\..\Emgu.CV.World\Netstandard\Emgu.CV.World.Netstandard.csproj", "{739AD468-29F3-48F6-8547-B1D8274D4C5A}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.CV.Runtime.Windows", "..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.shproj", "{ADC3C8E5-EBCD-4D3C-B3A4-20CFE0E42FC1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emgu.CV.Test.Netcore", "..\..\Emgu.CV.Test\Emgu.CV.Test.Netcore\Emgu.CV.Test.Netcore.csproj", "{98073C87-70AF-4485-8C64-8C499D28C03B}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Emgu.CV.Runtime.Windows", "..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.shproj", "{025593E6-63E3-4066-A2AA-D6DC1451DCD8}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.CV.Runtime.Mac", "..\..\Emgu.CV.Runtime\Mac\Emgu.CV.Runtime.Mac.shproj", "{74DB1213-249E-44DC-B193-BC5CEC981D3C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems*{11e54a7e-778d-466c-a176-71e150976ac1}*SharedItemsImports = 13

Loading…
Cancel
Save