summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/release.yml1
-rw-r--r--cmake/InstallAndPackage.cmake6
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2d05d9325..ac91e31fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -454,6 +454,7 @@ jobs:
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \
"-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \
+ -DAPPLE_UNIVERSAL_PACKAGE=1 \
# EOF
echo "::endgroup::"
diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake
index 5fb4646e5..be00cfc15 100644
--- a/cmake/InstallAndPackage.cmake
+++ b/cmake/InstallAndPackage.cmake
@@ -101,7 +101,11 @@ if(APPLE)
set(CPACK_GENERATOR "Bundle")
include(PackageBundle)
- set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
+ if (APPLE_UNIVERSAL_PACKAGE)
+ set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal")
+ else()
+ set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
+ endif()
elseif(WIN32)
set(CPACK_GENERATOR "ZIP")
if(OPTION_USE_NSIS)