Simplify brew prefix detection

CMakeLists.txt

@@ -106,8 +106,6 @@ OPTION(BUNDLE_QT_TRANSLATIONS	"Install Qt translation files for LMMS" OFF)
 
 
 IF(LMMS_BUILD_APPLE)
-	# Fix linking on 10.14+. See issue #4762 on github
-	LINK_DIRECTORIES("${APPLE_PREFIX}/lib")
 	SET(WANT_SOUNDIO OFF)
 	SET(WANT_ALSA OFF)
 	SET(WANT_OSS OFF)

cmake/modules/DetectMachine.cmake

@@ -160,18 +160,32 @@ ELSE(LMMS_BUILD_WIN32)
 ENDIF(LMMS_BUILD_WIN32)
 
 IF(LMMS_BUILD_APPLE)
+	# Detect cross-compilation.  "wrongbrew" is a custom wrapper for homebrew
+	IF((CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "x86_64" AND NOT LMMS_HOST_X86_64) OR
+		(CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64" AND NOT LMMS_HOST_ARM64))
+		EXECUTE_PROCESS(COMMAND wrongbrew --prefix RESULT_VARIABLE DETECT_WRONGBREW OUTPUT_VARIABLE WRONGBREW_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+	ENDIF()
+
 	# Detect Homebrew versus Macports environment
 	EXECUTE_PROCESS(COMMAND brew --prefix RESULT_VARIABLE DETECT_HOMEBREW OUTPUT_VARIABLE HOMEBREW_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 	EXECUTE_PROCESS(COMMAND which port RESULT_VARIABLE DETECT_MACPORTS OUTPUT_VARIABLE MACPORTS_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-	IF(${DETECT_HOMEBREW} EQUAL 0)
-       		SET(HOMEBREW 1)
-        	SET(APPLE_PREFIX "${HOMEBREW_PREFIX}")
-	ELSEIF(${DETECT_MACPORTS} EQUAL 0)
-        	SET(MACPORTS 1)
-        	GET_FILENAME_COMPONENT(MACPORTS_PREFIX ${MACPORTS_PREFIX} DIRECTORY)
-		GET_FILENAME_COMPONENT(MACPORTS_PREFIX ${MACPORTS_PREFIX} DIRECTORY)
+
+	IF(DETECT_WRONGBREW EQUAL 0)
+		SET(HOMEBREW 1)
+		SET(WRONGBREW 1)
+		SET(APPLE_PREFIX "${WRONGBREW_PREFIX}/lib")
+	ELSEIF(DETECT_HOMEBREW EQUAL 0)
+		SET(HOMEBREW 1)
+		SET(APPLE_PREFIX "${HOMEBREW_PREFIX}")
+	ELSEIF(DETECT_MACPORTS EQUAL 0)
+		SET(MACPORTS 1)
+		GET_FILENAME_COMPONENT(MACPORTS_PREFIX "${MACPORTS_PREFIX}" DIRECTORY)
+		GET_FILENAME_COMPONENT(MACPORTS_PREFIX "${MACPORTS_PREFIX}" DIRECTORY)
 		SET(APPLE_PREFIX "${MACPORTS_PREFIX}")
-        	LINK_DIRECTORIES(${LINK_DIRECTORIES} ${APPLE_PREFIX}/lib)
+	ENDIF()
+
+	IF(APPLE_PREFIX)
+		LINK_DIRECTORIES("${APPLE_PREFIX}/lib")
 	ENDIF()
 
 	# Detect OS Version