Link drm & zlib statically like before, make GL optional
This commit is contained in:
parent
1ad8c72d78
commit
750861b4ab
3 changed files with 4 additions and 7 deletions
2
external/ffmpeg/CMakeLists.txt
vendored
2
external/ffmpeg/CMakeLists.txt
vendored
|
|
@ -72,11 +72,11 @@ else()
|
|||
Xv
|
||||
Xext
|
||||
Xfixes
|
||||
drm
|
||||
)
|
||||
target_link_libraries(external_ffmpeg
|
||||
INTERFACE
|
||||
X11
|
||||
drm
|
||||
pthread
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
7
external/qt/CMakeLists.txt
vendored
7
external/qt/CMakeLists.txt
vendored
|
|
@ -259,6 +259,7 @@ else()
|
|||
target_link_static_libraries(external_qt
|
||||
INTERFACE
|
||||
proxy
|
||||
epoxy
|
||||
xkbcommon
|
||||
xkbcommon-x11
|
||||
xcb-glx
|
||||
|
|
@ -276,6 +277,7 @@ else()
|
|||
xcb-util
|
||||
xcb-render-util
|
||||
xcb-keysyms
|
||||
z
|
||||
)
|
||||
if (Qt5WaylandClient_FOUND)
|
||||
target_link_libraries(external_qt
|
||||
|
|
@ -288,13 +290,8 @@ else()
|
|||
INTERFACE
|
||||
desktop-app::linux_gtk_helper
|
||||
$<TARGET_FILE:desktop-app::linux_gtk_helper>
|
||||
)
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
fontconfig
|
||||
freetype
|
||||
EGL
|
||||
GL
|
||||
xcb
|
||||
X11
|
||||
X11-xcb
|
||||
|
|
|
|||
2
external/zlib/CMakeLists.txt
vendored
2
external/zlib/CMakeLists.txt
vendored
|
|
@ -23,5 +23,5 @@ elseif (WIN32)
|
|||
elseif (APPLE)
|
||||
target_link_libraries(external_zlib INTERFACE ${libs_loc}/local/lib/libz.a)
|
||||
else()
|
||||
target_link_libraries(external_zlib INTERFACE z)
|
||||
target_link_static_libraries(external_zlib INTERFACE z)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue