Use icon instead of iconUrl for nuget package.

CMakeLists.txt

@@ -857,6 +857,7 @@ IF(HAVE_WINDESKTOP_X86 OR HAVE_WINDESKTOP_X64)
 	<file src=\"Emgu.CV.runtime.windows.targets\" target=\"build\\${EMGUCV_WINDOWS_NUGET_ID}.targets\" />
 	<file src=\"..\\..\\..\\libs\\Emgu.CV.UI.dll\" target=\"lib\\net461\" />
 	<file src=\"..\\..\\..\\libs\\Emgu.CV.UI.xml\" target=\"lib\\net461\" />
+	<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 	<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
 ENDIF()
 
@@ -864,6 +865,7 @@ SET(EMGUCV_MACOS_NUGET_FILE_LIST "")
 IF(HAVE_OSX)
 	SET(EMGUCV_MACOS_NUGET_FILE_LIST "${EMGUCV_MACOS_NUGET_FILE_LIST} 
 	<file src=\"Emgu.CV.runtime.macos.targets\" target=\"build\\${EMGUCV_MACOS_NUGET_ID}.targets\" />
+	<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 	<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
 	SET(EMGUCV_MACOS_NUGET_DEPENDENCY "
 	<dependencies>
@@ -891,6 +893,7 @@ IF(HAVE_WINSTORE_10)
 	</dependencies>")
 	SET(EMGUCV_UWP_NUGET_FILE_LIST "${EMGUCV_UWP_NUGET_FILE_LIST} 
 	<file src=\"Emgu.CV.runtime.uwp.targets\" target=\"build\\${EMGUCV_UWP_NUGET_ID}.targets\" />
+	<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 	<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
 ENDIF()
 
@@ -899,6 +902,7 @@ SET(EMGUCV_NUGET_FILE_LIST "")
 SET(EMGUCV_NUGET_FILE_LIST "${EMGUCV_NUGET_FILE_LIST} 
 	<file src=\"..\\..\\..\\libs\\Emgu.CV.World.NetStandard.dll\" target=\"lib\\netstandard2.0\" />
 	<file src=\"..\\..\\..\\libs\\Emgu.CV.World.NetStandard.xml\" target=\"lib\\netstandard2.0\" />
+	<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 	<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
 
 SET(EMGUCV_NUGET_TITLE_ARCH "")
@@ -952,12 +956,15 @@ IF(WITH_CUDA)
 		SET(EMGU_CUDA_NPP_NUGET_FILE_LIST "${EMGU_CUDA_NPP_NUGET_FILE_LIST} 
 		<file src=\"..\\..\\..\\libs\\x64\\cu*.dll\" exclude=\"..\\..\\..\\libs\\x64\\cufft*.dll;..\\..\\..\\libs\\x64\\cudnn*.dll\" target=\"build\\x64\" /> 
 		<file src=\"..\\..\\..\\libs\\x64\\npp*.dll\" target=\"build\\x64\" />
+		<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />		
 		<file src=\"EULA.txt\" target=\"CUDA_EULA.txt\" />")
 		SET(EMGU_CUFFT_NUGET_FILE_LIST "${EMGU_CUFFT_NUGET_FILE_LIST} 
 		<file src=\"..\\..\\..\\libs\\x64\\cufft*.dll\" target=\"build\\x64\" />
+		<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 		<file src=\"EULA.txt\" target=\"CUDA_EULA.txt\" />")
 		SET(EMGU_CUDNN_NUGET_FILE_LIST "${EMGU_CUDNN_NUGET_FILE_LIST} 
 		<file src=\"..\\..\\..\\libs\\x64\\cudnn*.dll\" target=\"build\\x64\" />
+		<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 		<file src=\"NVIDIA_SLA_cuDNN_Support.txt\" target=\"cuDNN_SLA.txt\" />")
 	ENDIF()
 	
@@ -1008,6 +1015,7 @@ IF(HAVE_ANDROID_ALL_ARCH AND WIN32)
 	<file src=\"..\\..\\..\\libs\\Emgu.CV.Runtime.Android.xml\" target=\"lib\\MonoAndroid50\" />")
 	SET(EMGUCV_ANDROID_NUGET_FILE_LIST "${EMGUCV_ANDROID_NUGET_FILE_LIST} 
 	<file src=\"Emgu.CV.runtime.android.targets\" target=\"build\\${EMGUCV_ANDROID_NUGET_ID}.targets\" />
+	<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 	<file src=\"..\\..\\..\\${LICENSE_FILE_NAME}\" target=\"\" />")
 	SET(EMGUCV_ANDROID_NUGET_DEPENDENCY "
 	<dependencies>
@@ -1022,9 +1030,10 @@ IF(HAVE_IOS AND WIN32)
     <file src=\"..\\..\\..\\libs\\Emgu.CV.World.IOS.dll\" target=\"lib\\Xamarin.iOS10\" />
 	<file src=\"..\\..\\..\\libs\\Emgu.CV.World.IOS.XML\" target=\"lib\\Xamarin.iOS10\" />")
 	SET(EMGUCV_IOS_NUGET_FILE_LIST "${EMGUCV_IOS_NUGET_FILE_LIST} 
-	<file src=\"Emgu.CV.IOS.targets\" target=\"build\\${EMGUCV_IOS_NUGET_ID}.targets\" />
+	<file src=\"Emgu.CV.runtime.ios.targets\" target=\"build\\${EMGUCV_IOS_NUGET_ID}.targets\" />
+	<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
 	<file src=\"..\\..\\..\\${LICENSE_FILE_NAME}\" target=\"\" />")
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/iOS.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/iOS/Package.nuspec)
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.ios.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/Emgu.CV.runtime.ios/Package.nuspec)
 ENDIF()
 
 IF(HAVE_OSX)

cmake/Emgu.CV.Package.nuspec.in

@@ -9,7 +9,7 @@
     <license type="file">${EMGUCV_LICENSE_FILE}</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
 	<summary>${EMGUCV_NUGET_SUMMARY}</summary>
     <description>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. </description>

cmake/Emgu.CV.runtime.android.Package.nuspec.in

@@ -9,7 +9,7 @@
     <license type="file">${EMGUCV_LICENSE_FILE}</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
 	<summary>Runtime package of Emgu CV for Android</summary>
     <description>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. </description>

cmake/iOS.Package.nuspec.in → cmake/Emgu.CV.runtime.ios.Package.nuspec.in

@@ -9,7 +9,7 @@
     <license type="file">${EMGUCV_LICENSE_FILE}</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
 	<summary>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library.</summary>
     <description>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. </description>

cmake/Emgu.CV.runtime.macos.Package.nuspec.in

@@ -9,7 +9,7 @@
     <license type="file">${EMGUCV_LICENSE_FILE}</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
 	<summary>Runtime package of Emgu CV for MacOS</summary>
     <description>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. </description>

cmake/Emgu.CV.runtime.uwp.Package.nuspec.in

@@ -9,7 +9,7 @@
     <license type="file">${EMGUCV_LICENSE_FILE}</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
 	<summary>Runtime package of Emgu CV for Universal Windows Platform</summary>
     <description>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. </description>

cmake/Emgu.CV.runtime.windows.Package.nuspec.in

@@ -9,7 +9,7 @@
     <license type="file">${EMGUCV_LICENSE_FILE}</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
 	<summary>Runtime package of Emgu CV for Windows</summary>
     <description>Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. </description>

cmake/Emgu.CV.runtime.windows.cuda.cufft.Package.nuspec.in

@@ -8,7 +8,7 @@
     <owners>${NUGET_PACKAGE_VENDOR}</owners>
     <license type="file">CUDA_EULA.txt</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
 	<summary>This package provides the native CUDA FFT dependencies for EMGU software libraries</summary>
     <description>This package provides the native CUDA FFT dependencies for EMGU software libraries</description>

cmake/Emgu.CV.runtime.windows.cuda.dnn.Package.nuspec.in

@@ -8,7 +8,7 @@
     <owners>${NUGET_PACKAGE_VENDOR}</owners>
     <license type="file">cuDNN_SLA.txt</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
 	<summary>This package provides the native CUDA DNN dependencies for EMGU software libraries</summary>
     <description>This package provides the native CUDA DNN dependencies for EMGU software libraries</description>

cmake/Emgu.CV.runtime.windows.cuda.npp.Package.nuspec.in

@@ -8,7 +8,7 @@
     <owners>${CPACK_PACKAGE_VENDOR}</owners>
     <license type="file">CUDA_EULA.txt</license>
     <projectUrl>http://www.emgu.com/wiki/index.php</projectUrl>
-	<iconUrl>http://www.emgu.com/wiki/files/EmguCVLogo.gif</iconUrl>
+	<icon>icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
 	<summary>This package provides the native CUDA dependencies for ${EMGUCV_NUGET_ID}</summary>
     <description>This package provides the native CUDA dependencies for ${EMGUCV_NUGET_ID}</description>

platforms/nuget/CMakeLists.txt

@@ -13,6 +13,4 @@ ADD_SUBDIRECTORY("Emgu.CV.runtime.windows")
 ADD_SUBDIRECTORY("Emgu.CV.runtime.macos")
 ADD_SUBDIRECTORY("Emgu.CV.runtime.uwp")
 
-IF(HAVE_IOS AND WIN32)
-  ADD_SUBDIRECTORY("iOS")
-ENDIF()
+ADD_SUBDIRECTORY("Emgu.CV.runtime.ios")

platforms/nuget/iOS/CMakeLists.txt → platforms/nuget/Emgu.CV.runtime.ios/CMakeLists.txt

@@ -2,14 +2,17 @@
 #  Copyright (C) 2004-2020 by EMGU Corporation. All rights reserved.
 # --------------------------------------------------------
 
-IF(HAVE_IOS AND WIN32)
+IF(HAVE_IOS)
 
-PROJECT(Emgu.CV.iOS.nuget)
+PROJECT(Emgu.CV.runtime.ios.nuget)
 ADD_CUSTOM_TARGET(
    ${PROJECT_NAME} ALL
    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../../miscellaneous/nuget.exe" pack "${CMAKE_CURRENT_SOURCE_DIR}/Package.nuspec" -OutputDirectory "${CMAKE_CURRENT_SOURCE_DIR}/../"
 )
-#ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.World.iOS)
+
+IF(APPLE)
+  ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.World.iOS)
+ENDIF()
 
 if(ENABLE_SOLUTION_FOLDERS)
   set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "nuget")