Browse Source

Added Emgu.CV.World.NetStandard1_4 project to Emgu.CV.sln.

pull/50/merge
Canming Huang 8 years ago
parent
commit
b079e6414e
  1. 7
      Emgu.CV.World/CMakeLists.txt
  2. 2
      Emgu.CV/Emgu.CV.projitems
  3. 17
      Solution/Windows.Desktop/Emgu.CV.sln

7
Emgu.CV.World/CMakeLists.txt

@ -234,6 +234,13 @@ IF(EMGU_CV_BUILD OR EMGU_CV_EXAMPLE_BUILD)
PATTERN "CMakeFiles" EXCLUDE
PATTERN "${PROJECT_NAME}.dir" EXCLUDE
)
INSTALL(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/NetStandard1_4/Emgu.CV.World.NetStandard1_4.csproj
DESTINATION Emgu.CV.World/NetStandard1_4
COMPONENT emgucv_source
)
ENDIF()
ENDIF()

2
Emgu.CV/Emgu.CV.projitems

@ -316,6 +316,6 @@
<Error Text="'$(EmguCVErrorMessage)'" Condition="'$(EmguCVErrorMessage)'!=''" />
<Warning Text="'$(EmguCVWarningMessage)'" Condition="'$(EmguCVWarningMessage)'!=''" />
<Message Text="Compiling with $(EmguCVDeployMessage)binary" Condition="'$(EmguCVDeployMessage)'!=''" Importance="High" />
<Message Text="No native binary is deployed by the Emgu.CV shared project." Condition="'$(EmguCVDeployMessage)'==''" Importance="High" />
<Message Text="WARNING: No native binary is being deployed by the Emgu.CV shared project. Please remember to copy the native binary to the folder of your final executable, or there will be a PInvoke runtime exception during application execution." Condition="'$(EmguCVDeployMessage)'==''" Importance="High" />
</Target>
</Project>

17
Solution/Windows.Desktop/Emgu.CV.sln

@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26730.8
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emgu.CV.UI", "..\..\Emgu.CV.UI\Emgu.CV.UI.csproj", "{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}"
EndProject
@ -16,6 +16,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.CV.OCR", "..\..\Emgu.C
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emgu.CV.World", "..\..\Emgu.CV.World\Emgu.CV.World.csproj", "{3F5D7C08-96BA-4037-BB24-AFA2C336E260}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emgu.CV.World.NetStandard1_4", "..\..\Emgu.CV.World\NetStandard1_4\Emgu.CV.World.NetStandard1_4.csproj", "{34F870D4-5998-4647-94D1-B2547DD685BC}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems*{11e54a7e-778d-466c-a176-71e150976ac1}*SharedItemsImports = 13
@ -52,8 +54,19 @@ Global
{3F5D7C08-96BA-4037-BB24-AFA2C336E260}.Release|Any CPU.Build.0 = Release|Any CPU
{3F5D7C08-96BA-4037-BB24-AFA2C336E260}.Release|x64.ActiveCfg = Release|Any CPU
{3F5D7C08-96BA-4037-BB24-AFA2C336E260}.Release|x64.Build.0 = Release|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Debug|x64.ActiveCfg = Debug|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Debug|x64.Build.0 = Debug|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Release|Any CPU.Build.0 = Release|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Release|x64.ActiveCfg = Release|Any CPU
{34F870D4-5998-4647-94D1-B2547DD685BC}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F3E767AE-3D01-489F-9ED6-6BC8A3F9FAF7}
EndGlobalSection
EndGlobal
Loading…
Cancel
Save