From 50beda6621c4422302c51c4b95287c707252d91e Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 28 Dec 2020 20:54:19 +0100
Subject: [PATCH] Use same macdeployqt on Qt 5 and 6

---
 CMakeLists.txt  |  9 +++------
 cmake/Dmg.cmake | 12 +++---------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d09a5f52..41027633d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,9 @@ if(LINUX)
   include(cmake/Rpm.cmake)
   include(cmake/Deb.cmake)
 endif()
+if(APPLE)
+  include(cmake/Dmg.cmake)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
@@ -414,12 +417,6 @@ if(NOT CMAKE_CROSSCOMPILING)
   )
 endif()
 
-# make dmg
-# This needs to be included after the major Qt version is set.
-if(APPLE)
-  include(cmake/Dmg.cmake)
-endif()
-
 # Set up definitions
 
 add_definitions(-DBOOST_BIND_NO_PLACEHOLDERS)
diff --git a/cmake/Dmg.cmake b/cmake/Dmg.cmake
index d4ed78243..555b550ca 100644
--- a/cmake/Dmg.cmake
+++ b/cmake/Dmg.cmake
@@ -1,13 +1,7 @@
-if(BUILD_WITH_QT6)
-  set(MACDEPLOYQT_PATHS "/usr/local/opt/qt6/bin")
-elseif(BUILD_WITH_QT5)
-  set(MACDEPLOYQT_PATHS "/usr/local/opt/qt5/bin")
+find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS /usr/local/opt/qt6/bin /usr/local/opt/qt5/bin /usr/local/bin)
+if(MACDEPLOYQT_EXECUTABLE)
+  message(STATUS "Found: ${MACDEPLOYQT_EXECUTABLE}")
 else()
-  message(FATAL_ERROR "BUILD_WITH_QT6 or BUILD_WITH_QT5 must be set.")
-endif()
-
-find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt PATHS ${MACDEPLOYQT_PATHS} NO_DEFAULT_PATH)
-if(NOT MACDEPLOYQT_EXECUTABLE)
   message(WARNING "Missing macdeployqt executable.")
 endif()