kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Wayland integration uses Qt 6.5 APIs now

Browse source
This commit is contained in:
Ilya Fedin 2023-05-14 00:58:26 +04:00 • committed by John Preston
parent a7d000be71
commit 42f8428489
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
external/qt/package.cmake vendored
View file

@ -36,14 +36,16 @@ endif()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Qml Quick QuickWidgets QUIET) find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Qml Quick QuickWidgets QUIET)
set(qt_version_6_or_greater 0) set(qt_version_6_5_or_greater 0)
if (QT_VERSION_MAJOR GREATER_EQUAL 6) if (QT_VERSION_MAJOR GREATER_EQUAL 6)
set(qt_version_6_or_greater 1) if (QT_VERSION_MINOR GREATER_EQUAL 5)
set(qt_version_6_5_or_greater 1)
endif()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED)
endif() endif()
# QtWaylandScanner cmake integration from Qt 6 is used # QtWaylandScanner cmake integration from Qt 6 is used
cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_or_greater" ON) cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_5_or_greater" ON)
if (LINUX) if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)