Browse Source

Added missing files in release package.

pull/768/merge
Canming Huang 12 months ago
parent
commit
eb511f2b23
  1. 23
      CMakeLists.txt
  2. 44
      Emgu.CV.Contrib/CMakeLists.txt
  3. 1
      Emgu.CV.Example/CameraCapture/CameraCapture.csproj
  4. 4
      Emgu.CV.Runtime/Maui/UI/CMakeLists.txt
  5. 3
      Emgu.CV.Wpf/CMakeLists.txt

23
CMakeLists.txt

@ -2112,6 +2112,12 @@ ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/README.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV/README.txt)
INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV/README.txt" DESTINATION "." COMPONENT libs)
# ----------------------------------------------------------------------------
# Include license file & nuget icon into package
# ----------------------------------------------------------------------------
INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt" DESTINATION "." COMPONENT libs)
INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/miscellaneous/nuget_icon.png" DESTINATION "miscellaneous/" COMPONENT libs)
# ----------------------------------------------------------------------------
# Generate CvInvokeEntryPoints.cs file for Emgu CV project
# ----------------------------------------------------------------------------
@ -2258,9 +2264,8 @@ ADD_SUBDIRECTORY(Emgu.CV.WindowsUI)
ADD_SUBDIRECTORY(Emgu.CV.Example)
ADD_SUBDIRECTORY(Emgu.CV.Test)
ADD_SUBDIRECTORY(Emgu.CV.Cuda)
IF (EMGU_CV_WITH_TESSERACT)
ADD_SUBDIRECTORY(Emgu.CV.OCR)
ENDIF()
ADD_SUBDIRECTORY(Emgu.CV.OCR)
ADD_SUBDIRECTORY(Emgu.CV.Contrib)
ADD_SUBDIRECTORY(Emgu.CV.Models)
@ -2343,7 +2348,7 @@ IF(HAVE_MAC_CATALYST)
ENDIF()
ENDIF()
IF(IS_PRO_BUILD)
IF (TARGET Emgu.CV.runtime.maui)
INSTALL(
FILES
"Solution/CrossPlatform/Emgu.CV.CrossPlatform.sln"
@ -2359,17 +2364,15 @@ INSTALL(
"${CMAKE_CURRENT_SOURCE_DIR}/CommonAssemblyInfo.cs"
"${CMAKE_CURRENT_SOURCE_DIR}/Directory.Build.props"
"${CMAKE_CURRENT_SOURCE_DIR}/${LICENSE_FILE_NAME}"
#"${CMAKE_CURRENT_SOURCE_DIR}/nuget.config"
#"${CMAKE_CURRENT_SOURCE_DIR}/components.config"
DESTINATION .
COMPONENT emgucv_source
)
IF (EMGU_CV_WITH_FREETYPE)
IF (ANDROID)
#IF (EMGU_CV_WITH_FREETYPE)
# IF (ANDROID)
#INSTALL(EXPORT freetype DESTINATION lib)
ENDIF()
ENDIF()
# ENDIF()
#ENDIF()
IF (ANDROID)
SET(CPACK_GENERATOR ZIP)

44
Emgu.CV.Contrib/CMakeLists.txt

@ -5,34 +5,9 @@
IF(EMGU_CV_BUILD OR EMGU_CV_EXAMPLE_BUILD)
PROJECT(Emgu.CV.Contrib)
#IF (NOT ANDROID)
#FILE(GLOB_RECURSE SRC_CV_CONTRIB RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
#LIST(APPEND SRC_CV_CONTRIB ${CMAKE_CURRENT_SOURCE_DIR}/../CommonAssemblyInfo.cs)
#GENERATE_DOCUMENT(${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME})
#SIGN_ASSEMBLY(${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.snk)
#SET_CS_TARGET_FRAMEWORK(${CSC_TARGET_FRAMEWORK})
#ADD_CS_REFERENCES("${LIBRARY_OUTPUT_PATH}/Emgu.CV.dll;${LIBRARY_OUTPUT_PATH}/Emgu.Util.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.Cuda.dll")
#COMPILE_CS(${PROJECT_NAME} "library" "${SRC_CV_CONTRIB}" ALL)
#if(ENABLE_SOLUTION_FOLDERS)
# set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "emgu")
#endif()
#ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV Emgu.Util Emgu.CV.Cuda)
#INSTALL(
# FILES
# ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.dll
# ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.xml
# DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
# COMPONENT emgucv_binary)
#ENDIF()
IF(WIN32 OR APPLE OR ANDROID)
#IF(NETFX_CORE OR ANDROID)
INSTALL(
DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}
@ -48,25 +23,6 @@ INSTALL(
PATTERN "CMakeFiles" EXCLUDE
PATTERN "${PROJECT_NAME}.dir" EXCLUDE
)
#ELSE()
#INSTALL(
# DIRECTORY
# ${CMAKE_CURRENT_SOURCE_DIR}
# DESTINATION .
# COMPONENT emgucv_source
# FILES_MATCHING
# PATTERN "*.cs"
# PATTERN "${PROJECT_NAME}.csproj"
# PATTERN "*.resx"
# PATTERN ".svn" EXCLUDE
# PATTERN "obj" EXCLUDE
# PATTERN "CMakeFiles" EXCLUDE
# PATTERN "${PROJECT_NAME}.dir" EXCLUDE
# PATTERN "*Android*" EXCLUDE
# PATTERN "*iOS*" EXCLUDE
#)
#ENDIF()
ENDIF()

1
Emgu.CV.Example/CameraCapture/CameraCapture.csproj

@ -149,7 +149,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.Bitmap\Emgu.CV.Bitmap.csproj">

4
Emgu.CV.Runtime/Maui/UI/CMakeLists.txt

@ -12,8 +12,12 @@ IF(HAVE_ANDROID AND HAVE_MAUI_IOS AND HAVE_MAUI_MAC)
PATTERN "*.cs"
PATTERN "*.csproj"
PATTERN "Directory.Build.props"
#PATTERN "LICENSE.txt"
PATTERN "README.md"
#PATTERN "*.png"
PATTERN ".svn" EXCLUDE
PATTERN "obj" EXCLUDE
PATTERN "bin" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE
PATTERN "${PROJECT_NAME}.dir" EXCLUDE
)

3
Emgu.CV.Wpf/CMakeLists.txt

@ -36,6 +36,9 @@ IF (TARGET Emgu.CV)
FILES_MATCHING
PATTERN "Emgu.CV.Wpf.csproj"
PATTERN "Directory.Build.props"
#PATTERN "LICENSE.txt"
PATTERN "README.md"
#PATTERN "*.png"
PATTERN "*.cs"
PATTERN ".svn" EXCLUDE
PATTERN "obj" EXCLUDE

Loading…
Cancel
Save