mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-08-05 00:44:40 +08:00
Make installing of ICU libraries optional on Linux
ICU libraries are shipped in the official Qt installers but in a local or distribution build, Qt links against system libraries which made the install target fail in this two cases. By checking whether ICU libraries are inside the Qt library dir, we make sure that we redistribute those non system ICU libraries.
This commit is contained in:
committed by
Mathew Sutcliffe
parent
e186829db3
commit
7fde8eef07
11
install.pri
11
install.pri
@@ -47,9 +47,9 @@ else:unix: {
|
||||
QT5_LIBRARIES *= libQt5Xml.so.5
|
||||
QT5_LIBRARIES *= libqgsttools_p.so.1
|
||||
|
||||
QT5_LIBRARIES *= libicui18n.so.56
|
||||
QT5_LIBRARIES *= libicuuc.so.56
|
||||
QT5_LIBRARIES *= libicudata.so.56
|
||||
ICU_LIBRARIES *= libicui18n.so.56
|
||||
ICU_LIBRARIES *= libicuuc.so.56
|
||||
ICU_LIBRARIES *= libicudata.so.56
|
||||
|
||||
qt5_target.path = $${PREFIX}/lib
|
||||
QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS]
|
||||
@@ -61,6 +61,11 @@ for (LIBRARY, QT5_LIBRARIES) {
|
||||
qt5_target.files *= $${LIBRARY_PATH}
|
||||
}
|
||||
|
||||
for (LIBRARY, ICU_LIBRARIES) {
|
||||
LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY}
|
||||
exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH}
|
||||
}
|
||||
|
||||
INSTALLS += qt5_target
|
||||
|
||||
############### Install Qt5 audio plugins ##############
|
||||
|
||||
Reference in New Issue
Block a user