tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 74b1a7ff..0a713a32 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -307,6 +307,7 @@ if(MINGW)
6 set(PLUGIN_INSTALL_DIR ".")
7 set(DATA_INSTALL_DIR "share")
8 elseif(APPLE AND WITH_APP_BUNDLE)
9+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
10 set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
11 set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
12 set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
13@@ -470,11 +470,6 @@ set(CMAKE_AUTORCC ON)
14
15 if(APPLE)
16 set(CMAKE_MACOSX_RPATH TRUE)
17- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
18- if(NOT MACDEPLOYQT_EXE)
19- message(FATAL_ERROR "macdeployqt is required to build on macOS")
20- endif()
21- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
22 set(MACDEPLOYQT_EXTRA_BINARIES "")
23 elseif(WIN32)
24 find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ${Qt5_PREFIX}/tools/qt5/bin ENV PATH)
25diff --git a/src/post_install/CMakeLists.txt b/src/post_install/CMakeLists.txt
26index 359c891f..a6a061a3 100644
27--- a/src/post_install/CMakeLists.txt
28+++ b/src/post_install/CMakeLists.txt
29@@ -1,7 +1,7 @@
30 # The install commands in this subdirectory will be executed after all the install commands in the
31 # current scope are ran. It is required for correct functtioning of macdeployqt.
32
33-if(APPLE AND WITH_APP_BUNDLE)
34+if(FALSE)
35 # Run macdeloyqt on the main app and any extra binaries and plugins as specified by the
36 # _MACDEPLOYQT_EXTRA_BINARIES global property.
37 # All install(TARGETS) calls should have already been called.