kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

QtX11Extras no more needed for fcitx5-qt

Browse source
This commit is contained in:
Ilya Fedin 2020-08-01 13:07:25 +00:00 • committed by John Preston
parent 28ff839711
commit e78f35962f
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/qt/CMakeLists.txt vendored
View file

@ -82,10 +82,6 @@ if (DESKTOP_APP_USE_PACKAGED)
) )
endif() endif()
endif() endif()
if (Qt5X11Extras_FOUND)
target_link_libraries(external_qt INTERFACE Qt5::X11Extras)
endif()
else() else()
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
@ -121,7 +117,6 @@ else()
${qt_loc}/include/QtSvg ${qt_loc}/include/QtSvg
${qt_loc}/include/QtThemeSupport ${qt_loc}/include/QtThemeSupport
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtX11Extras
${qt_loc}/include/QtThemeSupport/${qt_version} ${qt_loc}/include/QtThemeSupport/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtThemeSupport/${qt_version}/QtThemeSupport ${qt_loc}/include/QtThemeSupport/${qt_version}/QtThemeSupport
@ -160,7 +155,6 @@ else()
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
QT_THEME_SUPPORT_LIB QT_THEME_SUPPORT_LIB
QT_SVG_LIB QT_SVG_LIB
QT_X11EXTRAS_LIB
) )
endif() endif()
@ -285,7 +279,6 @@ else()
${qt_libs_dbus_support} ${qt_libs_dbus_support}
plugins/bearer/${qt_lib_prefix}qgenericbearer plugins/bearer/${qt_lib_prefix}qgenericbearer
${qt_libs_dbus_bearers} ${qt_libs_dbus_bearers}
lib/${qt_lib_prefix}Qt5X11Extras
lib/${qt_lib_prefix}Qt5WaylandClient lib/${qt_lib_prefix}Qt5WaylandClient
${common_qt_libs} ${common_qt_libs}
${qt_libs_dbus} ${qt_libs_dbus}

8
external/qt/package.cmake vendored
View file

@ -27,15 +27,9 @@ if (LINUX)
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)
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES)
find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED)
elseif (DESKTOP_APP_USE_PACKAGED_LAZY)
find_package(Qt5 COMPONENTS X11Extras REQUIRED)
if (DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES)
find_package(Qt5 COMPONENTS Svg REQUIRED) find_package(Qt5 COMPONENTS Svg REQUIRED)
endif() endif()
endif()
if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION) if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
find_package(Qt5 OPTIONAL_COMPONENTS DBus QUIET) find_package(Qt5 OPTIONAL_COMPONENTS DBus QUIET)