Improve Qt5 detection on macOS

tresf · Feb 10, 2025 · a3a47b8 · a3a47b8
1 parent c81d497
commit a3a47b8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -206,7 +206,6 @@ jobs:
           mkdir build
           cmake -S . \
                 -B build \
-                -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" \
                 -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
                 $CMAKE_OPTS \
                 -DUSE_WERROR=OFF

diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
@@ -165,15 +165,26 @@ IF(LMMS_BUILD_APPLE)
 	# 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)
-		SET(APPLE_PREFIX "${MACPORTS_PREFIX}")
-        	LINK_DIRECTORIES(${LINK_DIRECTORIES} ${APPLE_PREFIX}/lib)
+	IF(DETECT_HOMEBREW EQUAL 0)
+		SET(HOMEBREW 1)
+		SET(APPLE_PREFIX "${HOMEBREW_PREFIX}")
+		# Configure Qt
+		SET(Qt5_DIR "${HOMEBREW_PREFIX}/opt/qt@5/lib/cmake/Qt5")
+		SET(Qt5Test_DIR "${HOMEBREW_PREFIX}/opt/qt@5/lib/cmake/Qt5Test")
+		SET(Qt6_DIR "${HOMEBREW_PREFIX}/opt/qt@6/lib/cmake/Qt6")
+		SET(Qt6Test_DIR "${HOMEBREW_PREFIX}/opt/qt@6/lib/cmake/Qt6Test")
+	ELSEIF(DETECT_MACPORTS EQUAL 0)
+		SET(MACPORTS 1)
+		# move up two directories
+		GET_FILENAME_COMPONENT(MACPORTS_PREFIX "${MACPORTS_PREFIX}" DIRECTORY)
+        GET_FILENAME_COMPONENT(MACPORTS_PREFIX "${MACPORTS_PREFIX}" DIRECTORY)
+        SET(APPLE_PREFIX "${MACPORTS_PREFIX}")
+		# Configure Qt
+		SET(Qt5_DIR "${MACPORTS_PREFIX}/lib/qt5/cmake/Qt5")
+		SET(Qt5Test_DIR "${MACPORTS_PREFIX}/lib/qt5/cmake/Qt5Test")
+		SET(Qt6_DIR "${MACPORTS_PREFIX}/lib/qt6/cmake/Qt6")
+		SET(Qt6Test_DIR "${MACPORTS_PREFIX}/lib/qt6/cmake/Qt6Test")
+		LINK_DIRECTORIES(${LINK_DIRECTORIES} ${APPLE_PREFIX}/lib)
 	ENDIF()
 
 	# Detect OS Version