From 3d5d83941bf0799a41085541b99bb71e5a1b1a19 Mon Sep 17 00:00:00 2001
From: Canming Huang <support@emgu.com>
Date: Sat, 29 Jun 2024 13:27:24 -0400
Subject: [PATCH] Fixed Emgu.CV.runtime.maui.macos package build.

---
 Emgu.CV.Maui/Mac/CMakeLists.txt          | 6 +++---
 Emgu.CV.Maui/Mac/Emgu.CV.Maui.Mac.csproj | 2 +-
 platforms/ios/build.sh                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Emgu.CV.Maui/Mac/CMakeLists.txt b/Emgu.CV.Maui/Mac/CMakeLists.txt
index b259ac422..5d58e4ec0 100644
--- a/Emgu.CV.Maui/Mac/CMakeLists.txt
+++ b/Emgu.CV.Maui/Mac/CMakeLists.txt
@@ -19,9 +19,9 @@ IF(HAVE_MAUI_MAC)
     )
 	
   IF(APPLE)	
-    PROJECT(Emgu.CV.Maui.Mac)
+    PROJECT(Emgu.CV.runtime.maui.macos)
 	SET(EXTRA_BUILD_FLAGS "/p:Platform=\"AnyCPU\"")
-    BUILD_DOTNET_PROJ(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.csproj" "${EXTRA_BUILD_FLAGS}" ALL)
+    BUILD_DOTNET_PROJ(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Maui.Mac.csproj" "${EXTRA_BUILD_FLAGS}" ALL)
         
     if(ENABLE_SOLUTION_FOLDERS)
       set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "emgu")
@@ -34,7 +34,7 @@ ENDIF()
 IF (HAVE_MAUI_MAC)
   INSTALL(
       DIRECTORY 
-      ${LIBRARY_OUTPUT_PATH}/Build/Emgu.CV.Maui.Mac
+      ${EMGU_CV_SOURCE_DIR}/libs/Build/Emgu.CV.runtime.maui.macos
       DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
       COMPONENT emgucv_binary)	
 ENDIF()
diff --git a/Emgu.CV.Maui/Mac/Emgu.CV.Maui.Mac.csproj b/Emgu.CV.Maui/Mac/Emgu.CV.Maui.Mac.csproj
index f58c36d5c..5d79c8b34 100644
--- a/Emgu.CV.Maui/Mac/Emgu.CV.Maui.Mac.csproj
+++ b/Emgu.CV.Maui/Mac/Emgu.CV.Maui.Mac.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <IsBindingProject>true</IsBindingProject>	
-    <AssemblyName>Emgu.CV.Maui.Mac</AssemblyName>
+    <AssemblyName>Emgu.CV.runtime.maui.macos</AssemblyName>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<OpenCVBinaryDir>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\libs))</OpenCVBinaryDir>
     <EmguCVCatalystBinaryDir>$(OpenCVBinaryDir)\iOS</EmguCVCatalystBinaryDir>
diff --git a/platforms/ios/build.sh b/platforms/ios/build.sh
index 5e608ce7b..0b0b58a4b 100755
--- a/platforms/ios/build.sh
+++ b/platforms/ios/build.sh
@@ -68,11 +68,11 @@ if [ "$1" = "simulator_x86_64" ] || [ "$1" = "" ] || [ "$1" = "all" ]; then
 fi
 
 if [ "$1" = "simulator_x86_64" ] || [ "$1" = "" ] || [ "$1" = "all" ]; then
-    cd Emgu.CV.Platform/Maui/iOS
+    cd Emgu.CV.Maui/UI
     #msbuild /p:Configuration=Release
     dotnet restore
     dotnet build
-    cd ../../../platforms/ios/simulator_x86_64
+    cd ../../platforms/ios/simulator_x86_64
     #build the package this time
     #./xcodebuild_wrapper WARNING_CFLAGS=-Wno-implicit-function-declaration -parallelizeTargets -jobs ${JOB_COUNT} -configuration Release -target package build
     xcodebuild WARNING_CFLAGS=-Wno-implicit-function-declaration -parallelizeTargets -jobs ${JOB_COUNT} -configuration Release -target package build