claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macOS bundles

Browse Source
This commit is contained in:
David Hrdlička
2022-02-07 23:05:59 +01:00
parent 4b3aabc4ba
commit 0f4931cdcc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@@ -174,12 +174,18 @@ endif()
# Install other dependencies # Install other dependencies
if(WIN32 OR (APPLE AND NOT QT)) if(WIN32)
install(CODE " install(CODE "
include(BundleUtilities) include(BundleUtilities)
get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE) get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$<TARGET_FILE_NAME:86Box>\" \"\" \"\")" fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$<TARGET_FILE_NAME:86Box>\" \"\" \"\")"
COMPONENT Runtime) COMPONENT Runtime)
elseif(APPLE AND NOT QT)
install(CODE "
include(BundleUtilities)
get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"\" \"\")"
COMPONENT Runtime)
endif() endif()

4
src/qt/CMakeLists.txt
View File

@@ -208,7 +208,7 @@ macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var _prefix)
endmacro() endmacro()
if (APPLE AND CMAKE_MACOSX_BUNDLE) if (APPLE AND CMAKE_MACOSX_BUNDLE)
set(prefix "$<TARGET_FILE_NAME:86Box>/Contents") set(prefix "86Box.app/Contents")
set(INSTALL_RUNTIME_DIR "${prefix}/MacOS") set(INSTALL_RUNTIME_DIR "${prefix}/MacOS")
set(INSTALL_CMAKE_DIR "${prefix}/Resources") set(INSTALL_CMAKE_DIR "${prefix}/Resources")
@@ -228,7 +228,7 @@ if (APPLE AND CMAKE_MACOSX_BUNDLE)
DESTINATION "${INSTALL_CMAKE_DIR}") DESTINATION "${INSTALL_CMAKE_DIR}")
# Note Mac specific extension .app # Note Mac specific extension .app
set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/$<TARGET_FILE_NAME:86Box>") set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/86Box.app")
# Directories to look for dependencies # Directories to look for dependencies
set(DIRS "${CMAKE_BINARY_DIR}") set(DIRS "${CMAKE_BINARY_DIR}")