Browse Source

Updated Emgu CV demo project dependencies.

pull/348/head
Canming Huang 5 years ago
parent
commit
33b60fbb62
  1. 11
      Emgu.CV.Example/Aruco/CMakeLists.txt
  2. 4
      Emgu.CV.Example/BuildInfo.NetCore.Console/CMakeLists.txt
  3. 2
      Emgu.CV.Example/CMakeLists.txt
  4. 11
      Emgu.CV.Example/CameraCapture/CMakeLists.txt
  5. 2
      Emgu.CV.Example/DynamicImage.Asp.NetCore/DynamicImage.Asp.NetCore.csproj
  6. 5
      Emgu.CV.Example/HelloWorld/CMakeLists.txt
  7. 6
      Emgu.CV.Example/VideoSurveillance/CMakeLists.txt
  8. 26
      Emgu.CV.Example/Webservice_Client/CMakeLists.txt
  9. 26
      Emgu.CV.Example/Webservice_Host/CMakeLists.txt

11
Emgu.CV.Example/Aruco/CMakeLists.txt

@ -2,11 +2,12 @@
# Copyright (C) 2004-2020 by EMGU Corporation. All rights reserved.
# --------------------------------------------------------
PROJECT(Example.Aruco)
IF(WIN32)
PROJECT(Example.Aruco)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "Aruco" "" ALL)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "Aruco" "" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.Platform.NetFramework)
#INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.${CS_EXECUTABLE_EXTENSION} DESTINATION bin COMPONENT emgucv_example_binary)
ENDIF()

4
Emgu.CV.Example/BuildInfo.NetCore.Console/CMakeLists.txt

@ -2,12 +2,12 @@
# Copyright (C) 2004-2020 by EMGU Corporation. All rights reserved.
# --------------------------------------------------------
IF (DOTNET_FOUND)
IF (DOTNET_FOUND AND WIN32)
PROJECT(Example.BuildInfo.NetCore.Console)
BUILD_DOTNET_PROJ(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.NetCore.Console.csproj" "" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} cvextern)
#ADD_DEPENDENCIES(${PROJECT_NAME} cvextern)
ENDIF()

2
Emgu.CV.Example/CMakeLists.txt

@ -338,7 +338,7 @@ IF(EMGU_CV_EXAMPLE_BUILD)
# )
ENDIF()
IF(HAVE_WINDESKTOP_X86 AND HAVE_WINDESKTOP_X64)
IF(HAVE_WINDESKTOP_X86 OR HAVE_WINDESKTOP_X64)
SET(EMGU_CV_REFERENCE
-r:System.Xml.dll
-r:System.Drawing.dll

11
Emgu.CV.Example/CameraCapture/CMakeLists.txt

@ -2,11 +2,12 @@
# Copyright (C) 2004-2020 by EMGU Corporation. All rights reserved.
# --------------------------------------------------------
PROJECT(Example.CameraCapture)
IF(WIN32)
PROJECT(Example.CameraCapture)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "CameraCapture" "" ALL)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "CameraCapture" "" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.Platform.NetFramework)
ENDIF()
#INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.${CS_EXECUTABLE_EXTENSION} DESTINATION bin COMPONENT emgucv_example_binary)

2
Emgu.CV.Example/DynamicImage.Asp.NetCore/DynamicImage.Asp.NetCore.csproj

@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="Emgu.CV.runtime.windows" Version="4.2.0.3662" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.2" />
</ItemGroup>

5
Emgu.CV.Example/HelloWorld/CMakeLists.txt

@ -6,11 +6,8 @@ IF (DOTNET_FOUND)
PROJECT(Example.HelloWorld)
#BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "HelloWorld" "" ALL)
BUILD_DOTNET_PROJ(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld.NetCore.csproj" "" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} cvextern)
#INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.${CS_EXECUTABLE_EXTENSION} DESTINATION bin COMPONENT emgucv_example_binary)
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.Platform.NetStandard)
ENDIF()

6
Emgu.CV.Example/VideoSurveillance/CMakeLists.txt

@ -7,12 +7,6 @@ PROJECT(Example.VideoSurveillance)
FILE(GLOB_RECURSE SRC_Example_VideoSurveillance RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
LIST(APPEND SRC_Example_VideoSurveillance ${CMAKE_CURRENT_SOURCE_DIR}/../../CommonAssemblyInfo.cs)
#IF(TARGET_ARCH_64)
# LIST(APPEND CS_FLAGS -platform:x64)
#ELSE()
# LIST(APPEND CS_FLAGS -platform:x86)
#ENDIF()
LIST(APPEND CS_FLAGS ${EMGU_CV_REFERENCE})
COMPILE_CS(${PROJECT_NAME} "winexe" "${SRC_Example_VideoSurveillance}" ALL)

26
Emgu.CV.Example/Webservice_Client/CMakeLists.txt

@ -3,28 +3,10 @@
# --------------------------------------------------------
IF(WIN32)
PROJECT(Example.Webservice_Client)
PROJECT(Example.Webservice_Client)
FILE(GLOB_RECURSE SRC_Example_Webservice_Client RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
LIST(APPEND SRC_Example_Webservice_Client
${CMAKE_CURRENT_SOURCE_DIR}/../Webservice_Host/IImageService.cs
${CMAKE_CURRENT_SOURCE_DIR}/../../CommonAssemblyInfo.cs)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "Webservice_Client" "" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.Platform.NetFramework)
#IF(TARGET_ARCH_64)
# LIST(APPEND CS_FLAGS -platform:x64)
#ELSE()
# LIST(APPEND CS_FLAGS -platform:x86)
#ENDIF()
LIST(APPEND CS_FLAGS ${EMGU_CV_REFERENCE})
ADD_CS_REFERENCES(System.ServiceModel.dll)
GET_CS_EXECUTABLE_EXTENSION()
COMPILE_CS(${PROJECT_NAME} "winexe" "${SRC_Example_Webservice_Client}" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.${CS_EXECUTABLE_EXTENSION} DESTINATION bin COMPONENT binary)
ENDIF()

26
Emgu.CV.Example/Webservice_Host/CMakeLists.txt

@ -2,23 +2,9 @@
# Copyright (C) 2004-2020 by EMGU Corporation. All rights reserved.
# --------------------------------------------------------
PROJECT(Example.Webservice_Host)
FILE(GLOB_RECURSE SRC_Example_Webservice_Host RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
LIST(APPEND SRC_Example_Webservice_Host ${CMAKE_CURRENT_SOURCE_DIR}/../../CommonAssemblyInfo.cs)
ADD_CS_REFERENCES(System.ServiceModel.dll)
#IF(TARGET_ARCH_64)
# LIST(APPEND CS_FLAGS -platform:x64)
#ELSE()
# LIST(APPEND CS_FLAGS -platform:x86)
#ENDIF()
LIST(APPEND CS_FLAGS ${EMGU_CV_REFERENCE})
COMPILE_CS(${PROJECT_NAME} "exe" "${SRC_Example_Webservice_Host}" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.${CS_EXECUTABLE_EXTENSION} DESTINATION bin COMPONENT binary)
IF(WIN32)
PROJECT(Example.Webservice_Host)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Windows.Desktop/Emgu.CV.Example.sln" "Webservice_Host" "" ALL)
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Emgu.CV.Examples")
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.Platform.NetFramework)
ENDIF()
Loading…
Cancel
Save