From baa3243412c5709bb60932e1608b525f648c1792 Mon Sep 17 00:00:00 2001
From: gxalpha <beckmann.sebastian@outlook.de>
Date: Sun, 10 Dec 2023 13:47:52 +0100
Subject: [PATCH] Revert "cmake: Align Product Name and Bundle Name on macOS"

This reverts commit 9f66c23825e41807c56f3a865d1c1462fa7ff73b.

This commit caused a crash in CEF on startup for many users. Let's just
revert it asap for now and worry about the minor problem it was solving
another time.
---
 .github/scripts/.build.zsh | 4 +---
 cmake/macos/helpers.cmake  | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh
index 44d95072c..03c352b18 100755
--- a/.github/scripts/.build.zsh
+++ b/.github/scripts/.build.zsh
@@ -179,14 +179,12 @@ build() {
       if [[ ${GITHUB_EVENT_NAME} == push && ${GITHUB_REF_NAME} =~ [0-9]+.[0-9]+.[0-9]+(-(rc|beta).+)? ]] {
         run_xcodebuild ${archive_args}
         run_xcodebuild ${export_args}
-
-        mv "OBS Studio.app" OBS.app
       } else {
         run_xcodebuild ${build_args}
 
         rm -rf OBS.app
         mkdir OBS.app
-        ditto "UI/${config}/OBS Studio.app" OBS.app
+        ditto UI/${config}/OBS.app OBS.app
       }
       popd
       ;;
diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake
index 5bfbab423..5fe033630 100644
--- a/cmake/macos/helpers.cmake
+++ b/cmake/macos/helpers.cmake
@@ -50,7 +50,7 @@ function(set_target_properties_obs target)
     if(target STREQUAL obs-studio)
       set_target_properties(
         ${target}
-        PROPERTIES OUTPUT_NAME "OBS Studio"
+        PROPERTIES OUTPUT_NAME OBS
                    MACOSX_BUNDLE TRUE
                    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
                    XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES
@@ -62,7 +62,7 @@ function(set_target_properties_obs target)
       set_target_xcode_properties(
         ${target}
         PROPERTIES PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio
-                   PRODUCT_NAME "OBS Studio"
+                   PRODUCT_NAME OBS
                    ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
                    CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
                    MARKETING_VERSION ${OBS_VERSION_CANONICAL}
@@ -75,7 +75,6 @@ function(set_target_properties_obs target)
                    INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey"
                    INFOPLIST_KEY_NSCameraUsageDescription "OBS needs to access the camera to enable camera sources to work."
                    INFOPLIST_KEY_NSMicrophoneUsageDescription "OBS needs to access the microphone to enable audio input.")
-
       # cmake-format: on
 
       get_property(obs_dependencies GLOBAL PROPERTY _OBS_DEPENDENCIES)