Changeset - r24678:cef844706fb1
[Not reviewed]
master
0 2 0
Owen Rudge - 3 years ago 2021-01-17 16:45:23
owen@owenrudge.net
Fix: [Actions] Give Universal Mac packages the "universal" suffix
2 files changed with 6 insertions and 1 deletions:
0 comments (0 inline, 0 general)
.github/workflows/release.yml
Show inline comments
 
@@ -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::"
 

	
cmake/InstallAndPackage.cmake
Show inline comments
 
@@ -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)
0 comments (0 inline, 0 general)