Skip to content

Commit f0459c9

Browse files
Revert "cmake: Align Product Name and Bundle Name on macOS"
This reverts commit 9f66c23. 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. (cherry picked from commit baa3243)
1 parent fc59b60 commit f0459c9

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/scripts/.build.zsh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,12 @@ build() {
175175
if [[ ${GITHUB_EVENT_NAME} == push && ${GITHUB_REF_NAME} =~ [0-9]+.[0-9]+.[0-9]+(-(rc|beta).+)? ]] {
176176
run_xcodebuild ${archive_args}
177177
run_xcodebuild ${export_args}
178-
179-
mv "OBS Studio.app" OBS.app
180178
} else {
181179
run_xcodebuild ${build_args}
182180

183181
rm -rf OBS.app
184182
mkdir OBS.app
185-
ditto "UI/${config}/OBS Studio.app" OBS.app
183+
ditto UI/${config}/OBS.app OBS.app
186184
}
187185
popd
188186
;;

cmake/macos/helpers.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function(set_target_properties_obs target)
5050
if(target STREQUAL obs-studio)
5151
set_target_properties(
5252
${target}
53-
PROPERTIES OUTPUT_NAME "OBS Studio"
53+
PROPERTIES OUTPUT_NAME OBS
5454
MACOSX_BUNDLE TRUE
5555
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
5656
XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES
@@ -62,7 +62,7 @@ function(set_target_properties_obs target)
6262
set_target_xcode_properties(
6363
${target}
6464
PROPERTIES PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio
65-
PRODUCT_NAME "OBS Studio"
65+
PRODUCT_NAME OBS
6666
ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
6767
CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
6868
MARKETING_VERSION ${OBS_VERSION_CANONICAL}
@@ -75,7 +75,6 @@ function(set_target_properties_obs target)
7575
INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey"
7676
INFOPLIST_KEY_NSCameraUsageDescription "OBS needs to access the camera to enable camera sources to work."
7777
INFOPLIST_KEY_NSMicrophoneUsageDescription "OBS needs to access the microphone to enable audio input.")
78-
7978
# cmake-format: on
8079

8180
get_property(obs_dependencies GLOBAL PROPERTY _OBS_DEPENDENCIES)

0 commit comments

Comments
 (0)