Link some libraries dynamically on Linux.
Some libraries that should be on all target systems could be linked dynamically, list taken from: https://github.com/AppImage/pkg2appimage/blob/master/excludelist This should fix some problems with fontconfig version mismatch.
This commit is contained in:
parent
6eff82642b
commit
22b099429a
3 changed files with 11 additions and 8 deletions
5
external/ffmpeg/CMakeLists.txt
vendored
5
external/ffmpeg/CMakeLists.txt
vendored
|
|
@ -54,11 +54,14 @@ else()
|
|||
va-drm
|
||||
va
|
||||
vdpau
|
||||
drm
|
||||
Xi
|
||||
Xext
|
||||
Xfixes
|
||||
Xrender
|
||||
)
|
||||
target_link_libraries(external_ffmpeg
|
||||
INTERFACE
|
||||
drm
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
12
external/qt/CMakeLists.txt
vendored
12
external/qt/CMakeLists.txt
vendored
|
|
@ -213,12 +213,6 @@ else()
|
|||
endif()
|
||||
target_link_static_libraries(external_qt
|
||||
INTERFACE
|
||||
SM
|
||||
ICE
|
||||
fontconfig
|
||||
freetype
|
||||
expat
|
||||
z
|
||||
xcb-shm
|
||||
xcb-xfixes
|
||||
xcb-render
|
||||
|
|
@ -239,6 +233,12 @@ else()
|
|||
endif()
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
ICE
|
||||
SM
|
||||
fontconfig
|
||||
freetype
|
||||
expat
|
||||
z
|
||||
xcb
|
||||
X11
|
||||
X11-xcb
|
||||
|
|
|
|||
2
external/zlib/CMakeLists.txt
vendored
2
external/zlib/CMakeLists.txt
vendored
|
|
@ -63,5 +63,5 @@ elseif (APPLE AND NOT build_osx)
|
|||
elseif (APPLE)
|
||||
target_link_libraries(external_zlib INTERFACE /usr/local/lib/libz.a)
|
||||
else()
|
||||
target_link_static_libraries(external_zlib INTERFACE z)
|
||||
target_link_libraries(external_zlib INTERFACE z)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue