Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicate check for X11

Browse Source
This commit is contained in:
Jonas Kvinge 2020-08-02 04:18:40 +02:00
parent 5b90c0d695
commit 33ccb5dbb2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -1189,11 +1189,10 @@ if(WIN32)
target_link_libraries(strawberry_lib PRIVATE dsound) target_link_libraries(strawberry_lib PRIVATE dsound)
endif(WIN32) endif(WIN32)
if(UNIX AND NOT APPLE) if(X11_FOUND)
# Hack: the Gold linker pays attention to the order that libraries are specified on the link line. # Hack: the Gold linker pays attention to the order that libraries are specified on the link line.
# -lX11 and -ldl are provided earlier in the link command but they're actually used by libraries that appear after them, so they end up getting ignored. # -lX11 and -ldl are provided earlier in the link command but they're actually used by libraries that appear after them, so they end up getting ignored.
# This appends them to the very end of the link line, ensuring they're always used. # This appends them to the very end of the link line, ensuring they're always used.
find_package(X11)
if(FREEBSD) if(FREEBSD)
target_link_libraries(strawberry_lib PRIVATE ${X11_X11_LIB}) target_link_libraries(strawberry_lib PRIVATE ${X11_X11_LIB})
else() else()