1
0
Fork 0

Build with Qt 5.15.1 in CentOS 7 docker.

This commit is contained in:
John Preston 2020-11-04 16:08:52 +03:00
parent 94025be392
commit 3a2d8a252d
2 changed files with 16 additions and 4 deletions

View file

@ -288,12 +288,12 @@ else()
plugins/bearer/${qt_lib_prefix}qgenericbearer plugins/bearer/${qt_lib_prefix}qgenericbearer
${qt_libs_dbus_bearers} ${qt_libs_dbus_bearers}
lib/${qt_lib_prefix}Qt5WaylandClient lib/${qt_lib_prefix}Qt5WaylandClient
lib/${qt_lib_prefix}Qt5ServiceSupport
${common_qt_libs} ${common_qt_libs}
${qt_libs_dbus} ${qt_libs_dbus}
lib/${qt_lib_prefix}Qt5Svg lib/${qt_lib_prefix}Qt5Svg
lib/${qt_lib_prefix}Qt5Core lib/${qt_lib_prefix}Qt5Core
lib/${qt_lib_prefix}qtpcre2 lib/${qt_lib_prefix}qtpcre2
lib/${qt_lib_prefix}xcb-static
) )
foreach (lib ${qt_libs}) foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}") list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
@ -345,10 +345,21 @@ else()
wayland-client wayland-client
xkbcommon xkbcommon
xkbcommon-x11 xkbcommon-x11
Xi
Xext Xext
Xfixes xcb-xkb
Xrender xcb-randr
xcb-icccm
xcb-shm
xcb-render
xcb-image
xcb-xfixes
xcb-xinerama
xcb-xinput
xcb-shape
xcb-sync
xcb-util
xcb-render-util
xcb-keysyms
ffi ffi
) )
if (DESKTOP_APP_USE_GLIBC_WRAPS) if (DESKTOP_APP_USE_GLIBC_WRAPS)

View file

@ -99,5 +99,6 @@ else()
${webrtc_libs_list} ${webrtc_libs_list}
desktop-app::external_openssl desktop-app::external_openssl
desktop-app::external_jpeg desktop-app::external_jpeg
desktop-app::external_opus
) )
endif() endif()