Add optional dependencies to Brewfile and improve CMake configuration
This commit updates the Brewfile to include additional optional dependencies such as Vulkan headers, RapidJSON, and various libraries for enhanced functionality. It also modifies CMake files to make the handling of optional components more user-friendly, allowing missing dependencies to disable features without causing build failures on macOS. Additionally, it refines the search paths for the Sparkle framework and adjusts the linking of the discord-rpc library based on the availability of RapidJSON.
This commit is contained in:
@@ -252,7 +252,18 @@ endif()
|
||||
find_package(KDSingleApplication-qt${QT_VERSION_MAJOR} 1.1.0 REQUIRED)
|
||||
|
||||
if(APPLE)
|
||||
find_library(SPARKLE Sparkle)
|
||||
# Sparkle may be installed as a developer framework (e.g. via a package manager).
|
||||
# Help CMake find it by searching typical Homebrew prefix locations as well.
|
||||
find_library(SPARKLE Sparkle
|
||||
PATHS
|
||||
/Library/Frameworks
|
||||
/System/Library/Frameworks
|
||||
/opt/homebrew/Frameworks
|
||||
/opt/homebrew/opt/sparkle-framework/Frameworks
|
||||
/usr/local/Frameworks
|
||||
/usr/local/opt/sparkle-framework/Frameworks
|
||||
PATH_SUFFIXES Frameworks
|
||||
)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
@@ -271,7 +282,7 @@ if(WIN32)
|
||||
endif()
|
||||
|
||||
if(APPLE OR WIN32)
|
||||
find_package(qtsparkle-qt${QT_VERSION_MAJOR})
|
||||
find_package(qtsparkle-qt${QT_VERSION_MAJOR} QUIET)
|
||||
if(TARGET "qtsparkle-qt${QT_VERSION_MAJOR}::qtsparkle")
|
||||
set(QTSPARKLE_FOUND ON)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user