mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
Minor cmake fixes
zlib is already included in DEPS_CLIENT
This commit is contained in:
parent
8b418292c2
commit
3911504bd9
|
@ -235,10 +235,12 @@ set(GAME_GENERATED_SHARED "src/game/generated/protocol.cpp" "src/game/generated/
|
||||||
file(GLOB DEP_MD5_SRC "src/engine/external/md5/*.c" "src/engine/external/md5/*.h")
|
file(GLOB DEP_MD5_SRC "src/engine/external/md5/*.c" "src/engine/external/md5/*.h")
|
||||||
add_library(md5 EXCLUDE_FROM_ALL OBJECT ${DEP_MD5_SRC})
|
add_library(md5 EXCLUDE_FROM_ALL OBJECT ${DEP_MD5_SRC})
|
||||||
set(DEP_MD5 $<TARGET_OBJECTS:md5>)
|
set(DEP_MD5 $<TARGET_OBJECTS:md5>)
|
||||||
|
list(APPEND TARGETS_DEP md5)
|
||||||
|
|
||||||
if(WEBSOCKETS)
|
if(WEBSOCKETS)
|
||||||
file(GLOB DEP_WEBSOCKETS_SRC "src/engine/external/libwebsockets/*.c" "src/engine/external/libwebsockets/*.h")
|
file(GLOB DEP_WEBSOCKETS_SRC "src/engine/external/libwebsockets/*.c" "src/engine/external/libwebsockets/*.h")
|
||||||
add_library(websockets EXCLUDE_FROM_ALL OBJECT ${DEP_WEBSOCKETS_SRC})
|
add_library(websockets EXCLUDE_FROM_ALL OBJECT ${DEP_WEBSOCKETS_SRC})
|
||||||
|
list(APPEND TARGETS_DEP websockets)
|
||||||
set(DEP_WEBSOCKETS $<TARGET_OBJECTS:websockets>)
|
set(DEP_WEBSOCKETS $<TARGET_OBJECTS:websockets>)
|
||||||
else()
|
else()
|
||||||
set(DEP_WEBSOCKETS)
|
set(DEP_WEBSOCKETS)
|
||||||
|
@ -288,7 +290,6 @@ if(CLIENT)
|
||||||
${DEPS_CLIENT}
|
${DEPS_CLIENT}
|
||||||
$<TARGET_OBJECTS:engine-shared>
|
$<TARGET_OBJECTS:engine-shared>
|
||||||
$<TARGET_OBJECTS:game-shared>
|
$<TARGET_OBJECTS:game-shared>
|
||||||
${DEP_ZLIB}
|
|
||||||
)
|
)
|
||||||
target_link_libraries(${TARGET_CLIENT} ${LIBS_CLIENT})
|
target_link_libraries(${TARGET_CLIENT} ${LIBS_CLIENT})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue