mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Fix building macOS/Sparkle without Browser

Browse Source
This commit is contained in:
derrod 2023-04-27 09:39:50 +02:00 committed by Ryan Foster
parent b9ef64d4eb
commit 0be8d8a28d
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/CMakeLists.txt
View File

@ -54,6 +54,7 @@ endif()
include(cmake/feature-twitch.cmake)
include(cmake/feature-restream.cmake)
include(cmake/feature-youtube.cmake)
include(cmake/feature-sparkle.cmake)
include(cmake/feature-whatsnew.cmake)
add_subdirectory(frontend-plugins)

10
UI/cmake/feature-macos-update.cmake Normal file
View File

@ -0,0 +1,10 @@
include_guard(DIRECTORY)
if(NOT TARGET OBS::blake2)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/blake2" "${CMAKE_BINARY_DIR}/deps/blake2")
endif()
target_sources(obs-studio PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mac.mm update/shared-update.cpp
update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
target_link_libraries(obs-studio PRIVATE "$<LINK_LIBRARY:FRAMEWORK,Security.framework>" OBS::blake2)

2
UI/cmake/feature-sparkle.cmake
View File

@ -13,6 +13,8 @@ if(SPARKLE_APPCAST_URL AND SPARKLE_PUBLIC_KEY)
endif()
target_enable_feature(obs-studio "Sparkle updater" ENABLE_SPARKLE_UPDATER)
include(cmake/feature-macos-update.cmake)
else()
set(SPARKLE_UPDATE_INTERVAL 0) # Set anything that's not an empty integer
target_disable_feature(obs-studio "Sparkle updater")

15
UI/cmake/feature-whatsnew.cmake
View File

@ -1,21 +1,8 @@
option(ENABLE_WHATSNEW "Enable WhatsNew dialog" ON)
if(NOT TARGET OBS::blake2)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/blake2" "${CMAKE_BINARY_DIR}/deps/blake2")
endif()
if(ENABLE_WHATSNEW AND TARGET OBS::browser-panels)
if(OS_MACOS)
find_library(SECURITY Security)
mark_as_advanced(SECURITY)
target_sources(obs-studio PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mac.mm update/shared-update.cpp
update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
target_link_libraries(obs-studio PRIVATE ${SECURITY} OBS::blake2)
include(cmake/feature-sparkle.cmake)
include(cmake/feature-macos-update.cmake)
elseif(OS_LINUX)
find_package(MbedTLS REQUIRED)
target_link_libraries(obs-studio PRIVATE MbedTLS::MbedTLS OBS::blake2)