Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Simplify adding version_str.inc files into the release package.

pull/768/merge
Canming Huang 1 year ago
parent
f18e847ffc
commit
0d9112262c
2 changed files with 72 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      CMakeLists.txt
  2. 98
      Emgu.CV.Extern/CMakeLists.txt

32
CMakeLists.txt
View File

@ -2787,26 +2787,40 @@ ELSEIF (WIN32)
ADD_SUBDIRECTORY(Emgu.RPC)
ENDIF()
# # ----------------------------------------------------------------------------
# # The source files
# # ----------------------------------------------------------------------------
# INSTALL(
# DIRECTORY
# ${CMAKE_CURRENT_SOURCE_DIR}/lib
# DESTINATION .
# COMPONENT emgucv_source
# FILES_MATCHING
# PATTERN "*.dll"
# PATTERN "*.txt"
# PATTERN "*.xml"
# PATTERN ".git" EXCLUDE
# PATTERN "obj" EXCLUDE
# PATTERN "CMake*" EXCLUDE
# PATTERN "Release" EXCLUDE
# PATTERN "${PROJECT_NAME}.dir" EXCLUDE
# )
# ----------------------------------------------------------------------------
# The source files
# Include the version_str.inc files in the package
# ----------------------------------------------------------------------------
INSTALL(
DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/lib
${CMAKE_CURRENT_SOURCE_DIR}/libs
DESTINATION .
COMPONENT emgucv_source
COMPONENT emgucv_binary
FILES_MATCHING
PATTERN "*.dll"
PATTERN "*.txt"
PATTERN "*.xml"
PATTERN "*version_str.inc"
PATTERN ".git" EXCLUDE
PATTERN "obj" EXCLUDE
PATTERN "CMake*" EXCLUDE
PATTERN "Release" EXCLUDE
PATTERN "${PROJECT_NAME}.dir" EXCLUDE
)
#WINDOWS STORE EXAMPLE
IF(HAVE_WINSTORE_10_X86 OR HAVE_WINSTORE_10_X64 OR HAVE_WINSTORE_10_ARM)
INSTALL(

98
Emgu.CV.Extern/CMakeLists.txt
View File

@ -4158,10 +4158,10 @@ ELSEIF (IOS)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENCV_BUILD_INFO_VERSION_STRING} ${CMAKE_SOURCE_DIR}/libs/iOS/simulator_${IOS_ARCH}_version_string.inc
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Copying build information from ${OPENCV_BUILD_INFO_VERSION_STRING} to ${CMAKE_SOURCE_DIR}/libs/iOS/simulator_${IOS_ARCH}_version_string.inc")
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/simulator_${IOS_ARCH}_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
#INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs/iOS/simulator_${IOS_ARCH}_version_string.inc"
# DESTINATION "libs/iOS/"
# COMPONENT emgucv_binary)
ELSEIF(IPHONEOS)
SET(IOS_RELEASE_FOLDER "Release-iphoneos")
SET(IOS_RELEASE_FILENAME "libcvextern_iphoneos_${IOS_ARCH}.a")
@ -4170,10 +4170,10 @@ ELSEIF (IOS)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENCV_BUILD_INFO_VERSION_STRING} ${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_${IOS_ARCH}_version_string.inc
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Copying build information from ${OPENCV_BUILD_INFO_VERSION_STRING} to ${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_${IOS_ARCH}_version_string.inc")
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_${IOS_ARCH}_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
#INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_${IOS_ARCH}_version_string.inc"
# DESTINATION "libs/iOS/"
# COMPONENT emgucv_binary)
ELSEIF(MAC_CATALYST)
SET(IOS_RELEASE_FOLDER "Release-catalyst")
SET(IOS_RELEASE_FILENAME "libcvextern_catalyst_${IOS_ARCH}.a")
@ -4182,10 +4182,10 @@ ELSEIF (IOS)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENCV_BUILD_INFO_VERSION_STRING} ${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_${IOS_ARCH}_version_string.inc
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Copying build information from ${OPENCV_BUILD_INFO_VERSION_STRING} to ${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_${IOS_ARCH}_version_string.inc")
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_${IOS_ARCH}_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
#INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_${IOS_ARCH}_version_string.inc"
# DESTINATION "libs/iOS/"
# COMPONENT emgucv_binary)
ENDIF()
#MESSAGE(STATUS "<<<<<< IOS_RELEASE_FOLDER: ${IOS_RELEASE_FOLDER} >>>>>>")
SET(LIBTOOL_LINKING_COMMAND libtool -static -arch_only ${IOS_ARCH} -o ${CMAKE_SOURCE_DIR}/libs/iOS/${IOS_RELEASE_FILENAME} bin${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/Release/*.a opencv/3rdparty/lib/Release/*.a ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/*.a)
@ -4296,18 +4296,18 @@ ELSEIF (IOS)
"${IPHONE_UNIVERSAL_STATIC_LIB_FILE}"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
IF(IPHONESIMULATOR AND (EXISTS "${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_arm64_version_string.inc"))
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_arm64_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
ENDIF()
IF(IPHONEOS AND (EXISTS "${CMAKE_SOURCE_DIR}/libs/iOS/simulator_x86_64_version_string.inc"))
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/simulator_x86_64_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
ENDIF()
#IF(IPHONESIMULATOR AND (EXISTS "${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_arm64_version_string.inc"))
# INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs/iOS/iphoneos_arm64_version_string.inc"
# DESTINATION "libs/iOS/"
# COMPONENT emgucv_binary)
#ENDIF()
#IF(IPHONEOS AND (EXISTS "${CMAKE_SOURCE_DIR}/libs/iOS/simulator_x86_64_version_string.inc"))
# INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs/iOS/simulator_x86_64_version_string.inc"
# DESTINATION "libs/iOS/"
# COMPONENT emgucv_binary)
#ENDIF()
ELSEIF(MAC_CATALYST)
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/libcvextern_catalyst_${IOS_ARCH}.a"
@ -4316,13 +4316,13 @@ ELSEIF (IOS)
IF(("${IOS_ARCH}" STREQUAL "x86_64") AND (EXISTS "${CMAKE_SOURCE_DIR}/libs/iOS/libcvextern_catalyst_arm64.a"))
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/libcvextern_catalyst_arm64.a"
"${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_arm64_version_string.inc"
#"${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_arm64_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
ELSEIF(("${IOS_ARCH}" STREQUAL "arm64") AND (EXISTS "${CMAKE_SOURCE_DIR}/libs/iOS/libcvextern_catalyst_x86_64.a"))
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs/iOS/libcvextern_catalyst_x86_64.a"
"${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_x86_64_version_string.inc"
#"${CMAKE_SOURCE_DIR}/libs/iOS/catalyst_x86_64_version_string.inc"
DESTINATION "libs/iOS/"
COMPONENT emgucv_binary)
ENDIF()
@ -4339,10 +4339,10 @@ ELSEIF (ANDROID)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENCV_BUILD_INFO_VERSION_STRING} ${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${ANDROID_ABI}_version_string.inc
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Copying build information from ${OPENCV_BUILD_INFO_VERSION_STRING} to ${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${ANDROID_ABI}_version_string.inc")
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${ANDROID_ABI}_version_string.inc"
DESTINATION "libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}"
COMPONENT emgucv_binary)
#INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${ANDROID_ABI}_version_string.inc"
# DESTINATION "libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}"
# COMPONENT emgucv_binary)
ELSEIF (IS_UBUNTU OR IS_DEBIAN OR IS_RHEL)
IF (WITH_CUDA)
@ -4359,10 +4359,10 @@ ELSEIF (IS_UBUNTU OR IS_DEBIAN OR IS_RHEL)
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Copying build information from ${OPENCV_BUILD_INFO_VERSION_STRING} to ${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${EMGUCV_ARCH}_version_string.inc")
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${EMGUCV_ARCH}_version_string.inc"
DESTINATION "libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}"
COMPONENT emgucv_binary)
#INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/${EMGUCV_ARCH}_version_string.inc"
# DESTINATION "libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}"
# COMPONENT emgucv_binary)
ELSEIF (APPLE)
@ -4419,22 +4419,22 @@ ELSEIF (APPLE)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENCV_BUILD_INFO_VERSION_STRING} ${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../${EMGUCV_ARCH}_version_string.inc
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Copying build information from ${OPENCV_BUILD_INFO_VERSION_STRING} to ${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../${EMGUCV_ARCH}_version_string.inc")
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../${EMGUCV_ARCH}_version_string.inc"
DESTINATION "libs/runtimes/osx/native"
COMPONENT emgucv_binary)
#INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../${EMGUCV_ARCH}_version_string.inc"
# DESTINATION "libs/runtimes/osx/native"
# COMPONENT emgucv_binary)
IF(("${EMGUCV_ARCH}" STREQUAL "x86_64") AND (EXISTS "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../arm64_version_string.inc"))
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../arm64_version_string.inc"
DESTINATION "libs/runtimes/osx/native"
COMPONENT emgucv_binary)
ELSEIF(("${EMGUCV_ARCH}" STREQUAL "arm64") AND (EXISTS "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../x86_64_version_string.inc"))
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../x86_64_version_string.inc"
DESTINATION "libs/runtimes/osx/native"
COMPONENT emgucv_binary)
ENDIF()
#IF(("${EMGUCV_ARCH}" STREQUAL "x86_64") AND (EXISTS "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../arm64_version_string.inc"))
# INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../arm64_version_string.inc"
# DESTINATION "libs/runtimes/osx/native"
# COMPONENT emgucv_binary)
#ELSEIF(("${EMGUCV_ARCH}" STREQUAL "arm64") AND (EXISTS "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../x86_64_version_string.inc"))
# INSTALL(FILES
# "${CMAKE_SOURCE_DIR}/libs${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}/../x86_64_version_string.inc"
# DESTINATION "libs/runtimes/osx/native"
# COMPONENT emgucv_binary)
#ENDIF()
SET(CVEXTERN_AND_DEPENDENCY_DLLS ${CVEXTERN_DEPENDENCY_DLLS} "libcvextern.dylib")

Write Preview
Loading…
Cancel
Save