From 39201e5042fd0d57f6b65fea1a26b397d970f49b Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 17 Mar 2022 21:21:31 -0600 Subject: [PATCH] Fix macdeployqt. This is based off of the instructions found here: https://riptutorial.com/qt/example/24133/integrating-with-cmake --- rpcs3/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 3c591b8122..8948defe23 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -132,6 +132,10 @@ if(USE_PRECOMPILED_HEADERS) endif() endif() +get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION) +get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY) +find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}") + # Copy icons to executable directory if(APPLE) add_custom_command(TARGET rpcs3 POST_BUILD @@ -143,7 +147,7 @@ if(APPLE) ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/../Resources/GuiConfigs COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/../Resources/git - COMMAND "${Qt5_DIR}/../../../bin/macdeployqt" "${PROJECT_BINARY_DIR}/bin/rpcs3.app") + COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app") elseif(UNIX) add_custom_command(TARGET rpcs3 POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory