|
|
@ -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")) |
|
|
|