diff options
| author | Janek Bevendorff <janek@jbev.net> | 2020-04-09 19:27:40 +0300 |
|---|---|---|
| committer | Janek Bevendorff <janek@jbev.net> | 2020-04-09 19:27:40 +0300 |
| commit | d189f9132e0aa373b3e7c6c4a8b30bca2204e002 (patch) | |
| tree | 069eda431628abb46dfc02f8dcbbfb97e2c45795 /CMakeLists.txt | |
| parent | 6128e5d58294f26411160f44da91087ebe7f4b07 (diff) | |
| parent | dcca5aa0f0ee2f2b8685787c01f934cb2b506ef7 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20d614936..f82a08467 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,12 +339,13 @@ if(MINGW) set(PLUGIN_INSTALL_DIR ".") set(DATA_INSTALL_DIR "share") elseif(APPLE AND WITH_APP_BUNDLE) - set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man") - set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") - set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") - set(BIN_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") - set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns") - set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources") + set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents") + set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man") + set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS") + set(PROXY_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS") + set(BIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS") + set(PLUGIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/PlugIns") + set(DATA_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/Resources") else() include(GNUInstallDirs) |