fix default system ID detection under macOS

Author: sakra

CMake/Mathematica/FindMathematica.cmake

@@ -369,12 +369,12 @@ macro (_systemNameToSystemID _systemName _systemProcessor _outSystemIDs)
 			set (${_outSystemIDs} "Windows")
 		endif()
 	elseif ("${_systemName}" STREQUAL "Darwin")
-		if ("${_systemProcessor}" STREQUAL "i386")
-			set (${_outSystemIDs} "MacOSX-x86")
+		if ("${_systemProcessor}" STREQUAL "arm64")
+			set (${_outSystemIDs} "MacOSX-ARM64")
 		elseif ("${_systemProcessor}" STREQUAL "x86_64")
 			set (${_outSystemIDs} "MacOSX-x86-64")
-		elseif ("${_systemProcessor}" STREQUAL "arm64")
-			set (${_outSystemIDs} "MacOSX-ARM64")
+		elseif ("${_systemProcessor}" STREQUAL "i386")
+			set (${_outSystemIDs} "MacOSX-x86")
 		elseif ("${_systemProcessor}" MATCHES "ppc64|powerpc64")
 			set (${_outSystemIDs} "Darwin-PowerPC64")
 		elseif ("${_systemProcessor}" MATCHES "ppc|powerpc")
@@ -446,7 +446,7 @@ macro (_get_system_IDs _outSystemIDs)
 				endif()
 			endforeach()
 		else()
-			# determine System ID by checking endianness and pointer size
+			# determine System ID by checking endianness and system processor
 			TEST_BIG_ENDIAN(_isBigEndian)
 			if (_isBigEndian)
 				if (CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -464,10 +464,11 @@ macro (_get_system_IDs _outSystemIDs)
 					endif()
 				endif()
 			else()
-				if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-					set (${_outSystemIDs} "MacOSX-x86-64")
+				_systemNameToSystemID("${CMAKE_SYSTEM_NAME}" "${CMAKE_SYSTEM_PROCESSOR}" _systemID)
+				if (_systemID)
+					list (APPEND ${_outSystemIDs} ${_systemID})
 				else()
-					set (${_outSystemIDs} "MacOSX-x86")
+					message (FATAL_ERROR "Unsupported macOS architecture ${CMAKE_SYSTEM_PROCESSOR}")
 				endif()
 			endif()
 		endif()
@@ -621,7 +622,7 @@ macro (_get_compatible_system_IDs _systemID _outSystemIDs)
 			else()
 				list (APPEND ${_outSystemIDs} "MacOSX-x86-64" "MacOSX-x86")
 			endif()
-		elseif ("${_systemID}" MATCHES "MacOSX-ARM64")
+		elseif ("${_systemID}" STREQUAL "MacOSX-ARM64")
 			if (Mathematica_VERSION)
 				# Mathematica 12.3 added support for MacOSX-ARM64
 				if (NOT "${Mathematica_VERSION}" VERSION_LESS "12.3")
@@ -664,7 +665,7 @@ macro (_get_compatible_system_IDs _systemID _outSystemIDs)
 	elseif ("${_systemID}" MATCHES "Linux-x86-64|Linux-IA64")
 		if (Mathematica_VERSION)
 			if (NOT "${Mathematica_VERSION}" VERSION_LESS "5.2")
-				# Mathematica 5.2 added support for 64-bit
+				# Mathematica 5.2 added support for 64-bit Linux x86
 				list (APPEND ${_outSystemIDs} ${_systemID})
 			endif()
 		else()
@@ -673,12 +674,41 @@ macro (_get_compatible_system_IDs _systemID _outSystemIDs)
 		# Linux 64-bit can run x86 through ia32-libs package
 		if (Mathematica_VERSION)
 			if ("${Mathematica_VERSION}" VERSION_LESS "11.3")
-				# Mathematica 11.3 dropped support for 32-bit Linux
+				# Mathematica 11.3 dropped support for 32-bit Linux x86
 				list (APPEND ${_outSystemIDs} "Linux")
 			endif()
 		else()
 			list (APPEND ${_outSystemIDs} "Linux")
 		endif()
+	elseif ("${_systemID}" STREQUAL "Linux-ARM64")
+		if (Mathematica_VERSION)
+			# Mathematica 13.2 added support for 64-bit Linux ARM
+			if (NOT "${Mathematica_VERSION}" VERSION_LESS "13.2")
+				list (APPEND ${_outSystemIDs} ${_systemID})
+			endif()
+		else()
+			list (APPEND ${_outSystemIDs} ${_systemID})
+		endif()
+	elseif ("${_systemID}" STREQUAL "Linux-ARM")
+		if (Mathematica_VERSION)
+			# Mathematica 10.0 added support for 32-bit Linux ARM
+			# Mathematica 13.2 dropped support for 32-bit Linux ARM
+			if (NOT "${Mathematica_VERSION}" VERSION_LESS "10.0" AND
+					"${Mathematica_VERSION}" VERSION_LESS "13.2")
+				list (APPEND ${_outSystemIDs} ${_systemID})
+			endif()
+		else()
+			list (APPEND ${_outSystemIDs} ${_systemID})
+		endif()
+	elseif ("${_systemID}" STREQUAL "Linux")
+		if (Mathematica_VERSION)
+			# Mathematica 11.3 dropped support for 32-bit Linux x86
+			if ("${Mathematica_VERSION}" VERSION_LESS "11.3")
+				list (APPEND ${_outSystemIDs} ${_systemID})
+			endif()
+		else()
+			list (APPEND ${_outSystemIDs} ${_systemID})
+		endif()
 	else()
 		list (APPEND ${_outSystemIDs} ${_systemID})
 	endif()