OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-06-30 08:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix Qt platform override in CMake 3

Browse source 
This override is still needed until Qt minimum version requirement is
increased to at least 6.3.0.

ui-config.h.in and CMake 2 are modified to avoid USE_XDG redefinition in
CMake 3.
This commit is contained in:
tytan652 2024-05-24 10:05:26 +02:00 committed by Ryan Foster
parent 1d8c377240
commit 116107bc86
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
UI/cmake/legacy.cmake
View file

@ -504,16 +504,22 @@ elseif(OS_POSIX)
target_compile_options(obs PRIVATE -Wno-unqualified-std-cast-call)
endif()
if(OS_LINUX AND ENABLE_WHATSNEW)
find_package(MbedTLS)
find_package(nlohmann_json REQUIRED)
if(NOT MBEDTLS_FOUND)
obs_status(FATAL_ERROR "mbedTLS not found, but required for WhatsNew support on Linux")
if(OS_LINUX)
if(USE_XDG)
target_compile_definitions(obs PRIVATE USE_XDG)
endif()
target_sources(obs PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mbedtls.cpp update/shared-update.cpp
update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
target_link_libraries(obs PRIVATE Mbedtls::Mbedtls nlohmann_json::nlohmann_json OBS::blake2)
if(ENABLE_WHATSNEW)
find_package(MbedTLS)
find_package(nlohmann_json REQUIRED)
if(NOT MBEDTLS_FOUND)
obs_status(FATAL_ERROR "mbedTLS not found, but required for WhatsNew support on Linux")
endif()
target_sources(obs PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mbedtls.cpp update/shared-update.cpp
update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
target_link_libraries(obs PRIVATE Mbedtls::Mbedtls nlohmann_json::nlohmann_json OBS::blake2)
endif()
endif()
endif()

2
UI/cmake/os-linux.cmake
View file

@ -1,5 +1,5 @@
target_sources(obs-studio PRIVATE platform-x11.cpp)
target_compile_definitions(obs-studio PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}")
target_compile_definitions(obs-studio PRIVATE USE_XDG OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}")
target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus)
target_sources(obs-studio PRIVATE system-info-posix.cpp)

3
UI/obs-app.cpp
View file

@ -1996,7 +1996,8 @@ static int run_program(fstream &logFile, int argc, char *argv[])
if (platform_theme && strcmp(platform_theme, "qt5ct") == 0)
unsetenv("QT_QPA_PLATFORMTHEME");
#if defined(ENABLE_WAYLAND) && defined(USE_XDG)
#if defined(ENABLE_WAYLAND) && defined(USE_XDG) && \
QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
/* NOTE: Qt doesn't use the Wayland platform on GNOME, so we have to
* force it using the QT_QPA_PLATFORM env var. It's still possible to
* use other QPA platforms using this env var, or the -platform command

2
UI/ui-config.h.in
View file

@ -1,7 +1,5 @@
#pragma once
#cmakedefine USE_XDG
#define OAUTH_BASE_URL "@OAUTH_BASE_URL@"
#define TWITCH_CLIENTID "@TWITCH_CLIENTID@"