Browse Source

Move macos binary from libs\macos to libs\runtimes\osx\native

pull/768/head
Canming Huang 3 years ago
parent
commit
53d532c3a8
  1. 6
      CMakeLists.txt
  2. 4
      Emgu.CV.Extern/CMakeLists.txt
  3. 2
      Emgu.CV.Runtime/Mac/Emgu.CV.Runtime.Mac.projitems

6
CMakeLists.txt

@ -367,9 +367,9 @@ ELSEIF(WIN32)
#MESSAGE(STATUS ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER: ${UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER}")
ELSEIF(APPLE AND NOT IOS)
IF ("${EMGUCV_ARCH}" STREQUAL "arm64")
SET(UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER "/macos/arm64")
SET(UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER "/runtimes/osx/native/arm64")
ELSE()
SET(UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER "/macos/x64")
SET(UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER "/runtimes/osx/native/x64")
ENDIF()
ELSEIF("${EMGUCV_ARCH}" STREQUAL "ubuntu_x64")
SET(UNMANAGED_LIBRARY_OUTPUT_SUBFOLDER "/runtimes/ubuntu-x64/native")
@ -509,7 +509,7 @@ IF(APPLE AND (NOT IOS))
SET(IS_MACOS_BUILD ON)
MESSAGE(STATUS "IS_MACOS_BUILD: ${IS_MACOS_BUILD}")
ENDIF()
CHECK_BINARY_EXIST("libs/macos" "lib*.dylib" HAVE_MACOS ${IS_MACOS_BUILD})
CHECK_BINARY_EXIST("libs/runtimes/osx/native" "lib*.dylib" HAVE_MACOS ${IS_MACOS_BUILD})
SET(IS_ANDROID_ARM64_V8A_BUILD OFF)
IF(ANDROID AND ("${ANDROID_ABI}" STREQUAL "arm64-v8a"))

4
Emgu.CV.Extern/CMakeLists.txt

@ -3995,7 +3995,7 @@ ELSEIF (APPLE)
COMMENT "Linking target for all architectures and ouputing to ${UNMANAGED_LIBRARY_OUTPUT_PATH}/../libusb-1.0.0.dylib")
INSTALL(FILES
${UNMANAGED_LIBRARY_OUTPUT_PATH}/../libusb-1.0.0.dylib
DESTINATION "libs/macos/"
DESTINATION "libs/runtimes/osx/native/"
COMPONENT emgucv_binary)
add_custom_command(TARGET ${the_target}
POST_BUILD
@ -4011,7 +4011,7 @@ ELSEIF (APPLE)
INSTALL(FILES
${UNMANAGED_LIBRARY_OUTPUT_PATH}/../libcvextern.dylib
DESTINATION "libs/macos/"
DESTINATION "libs/runtimes/osx/native/"
COMPONENT emgucv_binary)
#INSTALL(FILES ${the_target}

2
Emgu.CV.Runtime/Mac/Emgu.CV.Runtime.Mac.projitems

@ -9,7 +9,7 @@
<Import_RootNamespace>Emgu.CV</Import_RootNamespace>
</PropertyGroup>
<PropertyGroup>
<EmguCVMacBinaryDir>..\..\libs\macos</EmguCVMacBinaryDir>
<EmguCVMacBinaryDir>..\..\libs\runtimes\osx\native</EmguCVMacBinaryDir>
</PropertyGroup>
<PropertyGroup>
<EmguCVMacLinkTarget>Xamarin.Mac</EmguCVMacLinkTarget>

Loading…
Cancel
Save