kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

QtWaylandClient contains QtXkbCommonSupport includes

Browse source
This commit is contained in:
Ilya Fedin 2020-07-16 18:54:29 +04:00 • committed by John Preston
parent 2e9f0d27ad
commit 9eb24ca5c1
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
external/qt/CMakeLists.txt vendored
View file

@ -57,6 +57,15 @@ if (DESKTOP_APP_USE_PACKAGED)
) )
endif() endif()
if (Qt5XkbCommonSupport_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport)
target_include_directories(external_qt
INTERFACE
${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
)
endif()
if (Qt5WaylandClient_FOUND) if (Qt5WaylandClient_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
@ -97,6 +106,15 @@ else()
) )
endif() endif()
if (Qt5XkbCommonSupport_FOUND)
target_include_directories(external_qt SYSTEM
INTERFACE
${qt_loc}/include/QtXkbCommonSupport
${qt_loc}/include/QtXkbCommonSupport/${qt_version}
${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport
)
endif()
if (LINUX) if (LINUX)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
@ -129,6 +147,13 @@ else()
) )
endif() endif()
if (Qt5XkbCommonSupport_FOUND)
target_compile_definitions(external_qt
INTERFACE
QT_XKBCOMMON_SUPPORT_LIB
)
endif()
if (LINUX) if (LINUX)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE

1
external/qt/package.cmake vendored
View file

@ -25,6 +25,7 @@ find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED)
if (LINUX) if (LINUX)
find_package(Qt5 COMPONENTS WaylandClient REQUIRED) find_package(Qt5 COMPONENTS WaylandClient REQUIRED)
find_package(Qt5 COMPONENTS XkbCommonSupport)
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED) find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED)