Merge pull request #12656 from fwcd/capitalize-macos-bundle

macOS packaging: Capitalize bundle and executable name when `MACOS_BUNDLE` is set (Mixxx.app)
mixxxdj · Jan 27, 2024 · 83d90ab · 83d90ab
2 parents 0d1bcd2 + a81f552
commit 83d90ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1676,7 +1676,8 @@ set(MIXXX_INSTALL_DOCDIR "./doc")
 set(MIXXX_INSTALL_LICENSEDIR "./doc")
 if (APPLE AND MACOS_BUNDLE)
   set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
-  set(MACOS_BUNDLE_NAME mixxx)
+  set(MACOS_BUNDLE_NAME Mixxx)
+  set(MACOS_BUNDLE_IDENTIFIER org.mixxx.mixxx)
   set(MIXXX_INSTALL_PREFIX "${MACOS_BUNDLE_NAME}.app")
   set(MIXXX_INSTALL_DATADIR "${MIXXX_INSTALL_PREFIX}/Contents/Resources")
   set(MIXXX_INSTALL_DOCDIR "${MIXXX_INSTALL_DATADIR}")
@@ -1765,6 +1766,7 @@ if (APPLE)
 
     set_target_properties(mixxx PROPERTIES
         MACOSX_BUNDLE true
+        OUTPUT_NAME "${MACOS_BUNDLE_NAME}"
         MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/packaging/macos/Info.plist.in"
     )
   endif()

diff --git a/packaging/macos/Info.plist.in b/packaging/macos/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>CFBundleExecutable</key>
-    <string>mixxx</string>
+    <string>@MACOS_BUNDLE_NAME@</string>
 
     <key>CFBundleIconFile</key>
     <string>application.icns</string>
@@ -12,13 +12,13 @@
     <string>APPL</string>
 
     <key>CFBundleIdentifier</key>
-    <string>org.mixxx.mixxx</string>
+    <string>@MACOS_BUNDLE_IDENTIFIER@</string>
 
     <key>CFBundleName</key>
-    <string>Mixxx</string>
+    <string>@MACOS_BUNDLE_NAME@</string>
 
     <key>CFBundleDisplayName</key>
-    <string>Mixxx</string>
+    <string>@MACOS_BUNDLE_NAME@</string>
 
     <key>CFBundleVersion</key>
     <string>@MACOS_BUNDLE_VERSION@</string>