From 9d71d2f7fdb331839f4af6a6d1a91dddf3537c5c Mon Sep 17 00:00:00 2001 From: derrod Date: Wed, 15 Feb 2023 19:37:59 +0100 Subject: [PATCH] cmake: Remove ENABLE_SPARKLE_UPDATER option Since public key and appcast are now options we simply rely on those to decide whether or not to enable Sparkle. --- CMakeLists.txt | 4 ---- UI/CMakeLists.txt | 2 +- cmake/Modules/ObsDefaults_macOS.cmake | 4 ---- cmake/Modules/ObsHelpers_macOS.cmake | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 176553c0e..ddb72ed67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,10 +52,6 @@ if(OS_WINDOWS) "Build a multiarch installer (needs to run independently after both archs have compiled) (Windows)" OFF) -elseif(OS_MACOS) - option(ENABLE_SPARKLE_UPDATER "Enable Sparkle framework for updates (macOS)" - OFF) - elseif(OS_POSIX) option(LINUX_PORTABLE "Build portable version (Linux)" OFF) option(USE_XDG "Utilize XDG Base Directory Specification (Linux)" ON) diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index 0941dc085..c7083bb1f 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -445,7 +445,7 @@ elseif(OS_MACOS) update/shared-update.cpp update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp) - if(ENABLE_SPARKLE_UPDATER) + if(DEFINED SPARKLE_APPCAST_URL AND DEFINED SPARKLE_PUBLIC_KEY) find_library(SPARKLE Sparkle) mark_as_advanced(SPARKLE) diff --git a/cmake/Modules/ObsDefaults_macOS.cmake b/cmake/Modules/ObsDefaults_macOS.cmake index 2822d6f85..374f9134b 100644 --- a/cmake/Modules/ObsDefaults_macOS.cmake +++ b/cmake/Modules/ObsDefaults_macOS.cmake @@ -141,10 +141,6 @@ macro(setup_obs_project) set_option(ENABLE_RTMPS ON) endif() - if(DEFINED SPARKLE_APPCAST_URL AND DEFINED SPARKLE_PUBLIC_KEY) - set_option(ENABLE_SPARKLE_UPDATER ON) - endif() - set(CPACK_PACKAGE_NAME "OBS") set(CPACK_PACKAGE_VENDOR "${OBS_WEBSITE}") set(CPACK_GENERATOR "DragNDrop") diff --git a/cmake/Modules/ObsHelpers_macOS.cmake b/cmake/Modules/ObsHelpers_macOS.cmake index fb64515ec..2154fd714 100644 --- a/cmake/Modules/ObsHelpers_macOS.cmake +++ b/cmake/Modules/ObsHelpers_macOS.cmake @@ -354,7 +354,7 @@ function(setup_obs_bundle target) set(_CODESIGN_ENTITLEMENTS \"${CMAKE_SOURCE_DIR}/cmake/bundle/macOS\")" COMPONENT obs_resources) - if(ENABLE_SPARKLE_UPDATER) + if(DEFINED SPARKLE_APPCAST_URL AND DEFINED SPARKLE_PUBLIC_KEY) add_custom_command( TARGET ${target} POST_BUILD