edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1662

Browse source 
1662: Fix platform-specific client libraries for Linux. Fix #1660 r=def- a=Learath2

Do not hardcode library names, detect and depend on them properly instead.

Closes #1660 

Co-authored-by: Dmitry Marakasov <amdmi3@amdmi3.ru>
This commit is contained in:
bors[bot] 2019-04-23 16:14:46 +00:00
parent 34542e64b5 e404d6fd63
commit 37461e3d48
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -443,7 +443,10 @@ elseif(TARGET_OS STREQUAL "mac")
set(PLATFORM_LIBS ${CARBON} ${SECURITY})
else()
set(PLATFORM_CLIENT)
set(PLATFORM_CLIENT_LIBS GL GLU X11)
find_package(OpenGL)
find_package(X11)
set(PLATFORM_CLIENT_LIBS ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${X11_X11_LIB})
set(PLATFORM_CLIENT_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH})
if(TARGET_OS STREQUAL "linux")
set(PLATFORM_LIBS rt) # clock_gettime for glibc < 2.17
else()