diff --git a/CMakeLists.txt b/CMakeLists.txt index 82b6633a..7aca3276 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -610,15 +610,24 @@ IF(HAVE_OSX) ") ENDIF() -IF(HAVE_UBUNTU_X86_64) +IF(HAVE_UBUNTU_X86_64 OR HAVE_UBUNTU_ARM64) SET(EMGUTF_UBUNTU_NUGET_ID "${EMGUTF_NUGET_BASE_ID}.runtime.${NUGET_NATIVE_PLATFORM_ID_UBUNTU}") #IF ("${LICENSE_TYPE}" STREQUAL "Commercial") # SET(EMGUTF_UBUNTU_NUGET_ID "${EMGUTF_UBUNTU_NUGET_ID}-CR") #ENDIF() SET(EMGUTF_UBUNTU_NUGET_TITLE "Native runtime of ${EMGUTF_NUGET_TITLE} for Ubuntu") - SET(EMGUTF_UBUNTU_NUGET_FILE_LIST " + SET(EMGUTF_UBUNTU_NUGET_FILE_LIST "") + IF (HAVE_UBUNTU_X86_64) + SET(EMGUTF_UBUNTU_NUGET_FILE_LIST "${EMGUTF_UBUNTU_NUGET_FILE_LIST} - + ") + ENDIF() + IF (HAVE_UBUNTU_ARM64) + SET(EMGUTF_UBUNTU_NUGET_FILE_LIST "${EMGUTF_UBUNTU_NUGET_FILE_LIST} + + ") + ENDIF() + SET(EMGUTF_UBUNTU_NUGET_FILE_LIST "${EMGUTF_UBUNTU_NUGET_FILE_LIST} ") #") @@ -849,18 +858,6 @@ IF(HAVE_MAUI) ") - # Sign and copy the binary - #SET(EMGUTF_MAUI_POST_PROCESS_BINARY " -# ") - #IF(EMGU_SIGN_FOUND AND WIN32) - # SET(EMGUTF_MAUI_POST_PROCESS_BINARY "${EMGUTF_MAUI_POST_PROCESS_BINARY} - # -# - # -# ") - #ENDIF() - #SET(EMGUTF_MAUI_POST_PROCESS_BINARY "${EMGUTF_MAUI_POST_PROCESS_BINARY} - #") CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.TF.runtime.maui.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.TF.Runtime/Maui/UI/Full/Directory.Build.props) IF(EMGU_SIGN_FOUND AND WIN32) @@ -949,7 +946,7 @@ IF( HAVE_WINDESKTOP_LITE ) ") ENDIF() -IF( HAVE_OSX_LITE ) +IF(HAVE_OSX_LITE) SET(EMGUTF_LITE_MACOS_NUGET_FILE_LIST "${EMGUTF_LITE_MACOS_NUGET_FILE_LIST} @@ -960,9 +957,16 @@ IF( HAVE_OSX_LITE ) ") ENDIF() -IF (HAVE_UBUNTU_X86_64_LITE) +IF (HAVE_UBUNTU_X86_64_LITE OR HAVE_UBUNTU_ARM64_LITE) + IF (HAVE_UBUNTU_X86_64_LITE) + SET(EMGUTF_LITE_UBUNTU_NUGET_FILE_LIST "${EMGUTF_LITE_UBUNTU_NUGET_FILE_LIST} + ") + ENDIF() + IF (HAVE_UBUNTU_ARM64_LITE) + SET(EMGUTF_LITE_UBUNTU_NUGET_FILE_LIST "${EMGUTF_LITE_UBUNTU_NUGET_FILE_LIST} + ") + ENDIF() SET(EMGUTF_LITE_UBUNTU_NUGET_FILE_LIST "${EMGUTF_LITE_UBUNTU_NUGET_FILE_LIST} - ") #")