From 2427a5523cbc7e99003835dd80bf22125b89af38 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 9 Feb 2025 19:35:51 -0500 Subject: [PATCH] Revert back to "which port" --- cmake/modules/DetectMachine.cmake | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake index cd2ffe4f28e..4c35147b134 100644 --- a/cmake/modules/DetectMachine.cmake +++ b/cmake/modules/DetectMachine.cmake @@ -164,20 +164,25 @@ ENDIF(LMMS_BUILD_WIN32) 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 port dir RESULT_VARIABLE DETECT_MACPORTS OUTPUT_VARIABLE MACPORTS_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - IF(${DETECT_HOMEBREW} EQUAL 0) + 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}") + # 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) + ELSEIF(DETECT_MACPORTS EQUAL 0) SET(MACPORTS 1) - SET(APPLE_PREFIX "${MACPORTS_PREFIX}") + # 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(Qt6_DIR "${MACPORTS_PREFIX}/lib/qt6/cmake/Qt6") 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()