kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Link drm & zlib statically like before, make GL optional

Browse source
This commit is contained in:
Ilya Fedin 2021-09-09 01:14:43 +04:00 • committed by John Preston
parent 1ad8c72d78
commit 750861b4ab
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/ffmpeg/CMakeLists.txt vendored
View file

@ -72,11 +72,11 @@ else()
Xv Xv
Xext Xext
Xfixes Xfixes
drm
) )
target_link_libraries(external_ffmpeg target_link_libraries(external_ffmpeg
INTERFACE INTERFACE
X11 X11
drm
pthread pthread
) )
endif() endif()

7
external/qt/CMakeLists.txt vendored
View file

@ -259,6 +259,7 @@ else()
target_link_static_libraries(external_qt target_link_static_libraries(external_qt
INTERFACE INTERFACE
proxy proxy
epoxy
xkbcommon xkbcommon
xkbcommon-x11 xkbcommon-x11
xcb-glx xcb-glx
@ -276,6 +277,7 @@ else()
xcb-util xcb-util
xcb-render-util xcb-render-util
xcb-keysyms xcb-keysyms
z
) )
if (Qt5WaylandClient_FOUND) if (Qt5WaylandClient_FOUND)
target_link_libraries(external_qt target_link_libraries(external_qt
@ -288,13 +290,8 @@ else()
INTERFACE INTERFACE
desktop-app::linux_gtk_helper desktop-app::linux_gtk_helper
$<TARGET_FILE:desktop-app::linux_gtk_helper> $<TARGET_FILE:desktop-app::linux_gtk_helper>
)
target_link_libraries(external_qt
INTERFACE
fontconfig fontconfig
freetype freetype
EGL
GL
xcb xcb
X11 X11
X11-xcb X11-xcb

2
external/zlib/CMakeLists.txt vendored
View file

@ -23,5 +23,5 @@ elseif (WIN32)
elseif (APPLE) elseif (APPLE)
target_link_libraries(external_zlib INTERFACE ${libs_loc}/local/lib/libz.a) target_link_libraries(external_zlib INTERFACE ${libs_loc}/local/lib/libz.a)
else() else()
target_link_libraries(external_zlib INTERFACE z) target_link_static_libraries(external_zlib INTERFACE z)
endif() endif()