Browse Source

Let Emgu CV shared project detect .NetCore project type.

pull/19/head
Canming Huang 9 years ago
parent
commit
bcf4122200
  1. 4
      CMakeLists.txt
  2. 6
      Emgu.CV/Emgu.CV.projitems

4
CMakeLists.txt

@ -309,13 +309,13 @@ ENDIF()
CHECK_BINARY_EXIST("bin/UWP_arm" "*.dll" HAVE_WINSTORE_10_ARM ${IS_WINSTORE_10_ARM_BUILD}) CHECK_BINARY_EXIST("bin/UWP_arm" "*.dll" HAVE_WINSTORE_10_ARM ${IS_WINSTORE_10_ARM_BUILD})
SET(IS_WINDESKTOP_X86_BUILD OFF) SET(IS_WINDESKTOP_X86_BUILD OFF)
IF (WIN32 AND ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") AND ("${EMGUCV_ARCH}" STREQUAL "win32"))
IF (WIN32 AND ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") AND ("${EMGUCV_ARCH}" STREQUAL "win32") AND (NOT ANDROID))
SET (IS_WINDESKTOP_X86_BUILD ON) SET (IS_WINDESKTOP_X86_BUILD ON)
ENDIF() ENDIF()
CHECK_BINARY_EXIST("bin/x86" "*.dll" HAVE_WINDESKTOP_X86 ${IS_WINDESKTOP_X86_BUILD}) CHECK_BINARY_EXIST("bin/x86" "*.dll" HAVE_WINDESKTOP_X86 ${IS_WINDESKTOP_X86_BUILD})
SET (IS_WINDESKTOP_X64_BUILD OFF) SET (IS_WINDESKTOP_X64_BUILD OFF)
IF (WIN32 AND ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") AND ("${EMGUCV_ARCH}" STREQUAL "win64"))
IF (WIN32 AND ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") AND ("${EMGUCV_ARCH}" STREQUAL "win64") AND (NOT ANDROID))
SET (IS_WINDESKTOP_X64_BUILD ON) SET (IS_WINDESKTOP_X64_BUILD ON)
ENDIF() ENDIF()
CHECK_BINARY_EXIST("bin/x64" "*.dll" HAVE_WINDESKTOP_X64 ${IS_WINDESKTOP_X64_BUILD}) CHECK_BINARY_EXIST("bin/x64" "*.dll" HAVE_WINDESKTOP_X64 ${IS_WINDESKTOP_X64_BUILD})

6
Emgu.CV/Emgu.CV.projitems

@ -269,6 +269,12 @@
<PropertyGroup> <PropertyGroup>
<EmguCVLinkTarget>WindowsForms</EmguCVLinkTarget> <EmguCVLinkTarget>WindowsForms</EmguCVLinkTarget>
</PropertyGroup> </PropertyGroup>
</When>
<!-- Windows Form Application -->
<When Condition="'$(EmguCVLinkTarget)'=='' AND ('$(TargetFramework)'=='netstandard1.4')">
<PropertyGroup>
<EmguCVLinkTarget>DotNetCore</EmguCVLinkTarget>
</PropertyGroup>
</When> </When>
</Choose> </Choose>
<Target Name="EmguCVPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EmguCVPackageBuildImports" BeforeTargets="PrepareForBuild">

Loading…
Cancel
Save