Skip to content

Commit

Permalink
merge fix
Browse files Browse the repository at this point in the history
  • Loading branch information
summeroff committed Dec 4, 2023
1 parent 99b64c0 commit 59dde3a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
8 changes: 0 additions & 8 deletions CI/macos/02_build_obs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ build_obs() {
set -o pipefail && xcodebuild -exportArchive -archivePath "obs-studio.xcarchive" -exportOptionsPlist "exportOptions.plist" -exportPath "." 2>&1 | xcbeautify
else
set +e
mkdir install1
mkdir install2
mkdir install_dst1
mkdir install_dst2
export INSTALL_DIR1=$(pwd)/install1
export INSTALL_DIR2=$(pwd)/install2
export DSTROOT1=$(pwd)/install_dst1
export DSTROOT2=$(pwd)/install_dst2

echo "Build OBS... list xcodebuild tartgets"
xcodebuild -list
Expand Down
1 change: 1 addition & 0 deletions cmake/Modules/ObsHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ endfunction()

# Helper function to set up OBS plugin targets
function(setup_plugin_target target)
message("[setup_plugin_target] in modules target: ${target}")
set_target_properties(${target} PROPERTIES PREFIX "")

install(
Expand Down
1 change: 1 addition & 0 deletions cmake/macos/helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ include(helpers_common)

# set_target_properties_obs: Set target properties for use in obs-studio
function(set_target_properties_obs target)
message(STATUS "[set_target_properties_obs] Setting target properties for ${target}...")
set(options "")
set(oneValueArgs "")
set(multiValueArgs PROPERTIES)
Expand Down

0 comments on commit 59dde3a

Please sign in to comment.