kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Update for Qt 6.3

Browse source
This commit is contained in:
Ilya Fedin 2022-04-12 18:27:07 +04:00 • committed by John Preston
parent b30865ced9
commit ed1411f129
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
external/qt/package.cmake vendored
View file

@ -6,7 +6,7 @@
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
if (DESKTOP_APP_QT6) if (DESKTOP_APP_QT6)
set(qt_version 6.2.4) set(qt_version 6.3.0)
else() else()
set(qt_version 5.15.3) set(qt_version 5.15.3)
endif() endif()
@ -32,6 +32,7 @@ if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
if (DESKTOP_APP_QT6) if (DESKTOP_APP_QT6)
find_package(Qt6 COMPONENTS WaylandClient REQUIRED) find_package(Qt6 COMPONENTS WaylandClient REQUIRED)
find_package(Qt6 OPTIONAL_COMPONENTS WaylandGlobalPrivate QUIET)
else() else()
find_package(Qt5 COMPONENTS WaylandClient REQUIRED) find_package(Qt5 COMPONENTS WaylandClient REQUIRED)
find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET) find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET)

36
external/qt/qt6/CMakeLists.txt vendored
View file

@ -11,8 +11,10 @@ if (DESKTOP_APP_USE_PACKAGED)
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
Qt6::Core Qt6::Core
Qt6::CorePrivate
Qt6::Core5Compat Qt6::Core5Compat
Qt6::Gui Qt6::Gui
Qt6::GuiPrivate
Qt6::OpenGL Qt6::OpenGL
Qt6::Widgets Qt6::Widgets
Qt6::OpenGLWidgets Qt6::OpenGLWidgets
@ -20,23 +22,26 @@ if (DESKTOP_APP_USE_PACKAGED)
Qt6::Svg Qt6::Svg
) )
target_include_directories(external_qt SYSTEM
INTERFACE
${Qt6Core_PRIVATE_INCLUDE_DIRS}
${Qt6Gui_PRIVATE_INCLUDE_DIRS}
)
if (Qt6DBus_FOUND) if (Qt6DBus_FOUND)
target_link_libraries(external_qt INTERFACE Qt6::DBus) target_link_libraries(external_qt
INTERFACE
Qt6::DBus
)
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt INTERFACE Qt6::WaylandClient) target_link_libraries(external_qt
target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS} Qt6::WaylandClient
Qt6::WaylandClientPrivate
) )
if (Qt6WaylandGlobalPrivate_FOUND)
target_link_libraries(external_qt
INTERFACE
Qt6::WaylandGlobalPrivate
)
endif()
endif() endif()
return() return()
@ -69,8 +74,11 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtWaylandGlobal
${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtWaylandGlobal/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient ${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
${qt_loc}/include/QtWaylandGlobal/${qt_version}/QtWaylandGlobal
) )
endif() endif()
@ -100,6 +108,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
QT_WAYLANDGLOBAL_LIB
) )
endif() endif()
@ -252,7 +261,6 @@ if (LINUX)
target_link_static_libraries(external_qt target_link_static_libraries(external_qt
INTERFACE INTERFACE
proxy proxy
epoxy
xkbcommon xkbcommon
xkbcommon-x11 xkbcommon-x11
xcb-glx xcb-glx
@ -263,7 +271,6 @@ if (LINUX)
xcb-render xcb-render
xcb-image xcb-image
xcb-xfixes xcb-xfixes
xcb-xinput
xcb-shape xcb-shape
xcb-sync xcb-sync
xcb-util xcb-util
@ -281,8 +288,11 @@ if (LINUX)
desktop-app::linux_xcb_helper desktop-app::linux_xcb_helper
fontconfig fontconfig
freetype freetype
EGL
GL
xcb xcb
X11 X11
X11-xcb X11-xcb
glib-2.0
) )
endif() endif()