diff --git a/frontend/cmake/os-freebsd.cmake b/frontend/cmake/os-freebsd.cmake index 128d681d8..3cc6403c4 100644 --- a/frontend/cmake/os-freebsd.cmake +++ b/frontend/cmake/os-freebsd.cmake @@ -7,7 +7,11 @@ target_sources( utility/system-info-posix.cpp ) target_compile_definitions(obs-studio PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}") -target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus procstat) +target_link_libraries(obs-studio PRIVATE Qt::DBus procstat) + +if(Qt6_VERSION AND Qt6_VERSION VERSION_LESS "6.9.0") + target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate) +endif() find_package(Libpci REQUIRED) target_link_libraries(obs-studio PRIVATE Libpci::pci) diff --git a/frontend/cmake/os-linux.cmake b/frontend/cmake/os-linux.cmake index 332002ede..d146e7297 100644 --- a/frontend/cmake/os-linux.cmake +++ b/frontend/cmake/os-linux.cmake @@ -10,7 +10,11 @@ target_compile_definitions( obs-studio PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}" $<$:ENABLE_PORTABLE_CONFIG> ) -target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus) +target_link_libraries(obs-studio PRIVATE Qt::DBus) + +if(Qt6_VERSION AND Qt6_VERSION VERSION_LESS "6.9.0") + target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate) +endif() find_package(Libpci REQUIRED) target_link_libraries(obs-studio PRIVATE Libpci::pci) diff --git a/frontend/plugins/aja-output-ui/CMakeLists.txt b/frontend/plugins/aja-output-ui/CMakeLists.txt index 37e4ba04d..57f956e07 100644 --- a/frontend/plugins/aja-output-ui/CMakeLists.txt +++ b/frontend/plugins/aja-output-ui/CMakeLists.txt @@ -10,8 +10,6 @@ find_package(LibAJANTV2 REQUIRED) find_package(Qt6 REQUIRED Widgets) if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) - find_package(Qt6 REQUIRED Gui) - find_package(X11 REQUIRED) endif() @@ -47,7 +45,6 @@ target_link_libraries( Qt::Widgets AJA::LibAJANTV2 $<$:X11::X11> - $<$:Qt::GuiPrivate> ) target_link_options(aja-output-ui PRIVATE $<$:/IGNORE:4099>) diff --git a/frontend/plugins/decklink-output-ui/CMakeLists.txt b/frontend/plugins/decklink-output-ui/CMakeLists.txt index d72dac269..99beb5668 100644 --- a/frontend/plugins/decklink-output-ui/CMakeLists.txt +++ b/frontend/plugins/decklink-output-ui/CMakeLists.txt @@ -8,8 +8,6 @@ endif() find_package(Qt6 REQUIRED Widgets) if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) - find_package(Qt6 REQUIRED Gui) - find_package(X11 REQUIRED) endif() @@ -38,7 +36,6 @@ target_link_libraries( Qt::Widgets "$<$:$>" $<$:X11::X11> - $<$:Qt::GuiPrivate> ) if(OS_WINDOWS) diff --git a/frontend/plugins/frontend-tools/CMakeLists.txt b/frontend/plugins/frontend-tools/CMakeLists.txt index f7ffa4ae3..b8afa7719 100644 --- a/frontend/plugins/frontend-tools/CMakeLists.txt +++ b/frontend/plugins/frontend-tools/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.28...3.30) find_package(Qt6 REQUIRED Widgets) if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) - find_package(Qt6 REQUIRED Gui) find_package(X11 REQUIRED) endif() @@ -65,7 +64,6 @@ target_link_libraries( Qt::Widgets "$<$:$>" $<$:X11::X11> - $<$:Qt::GuiPrivate> ) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")