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 pull request #906 from heinrich5991/pr_ddnet_dont_copy_twice

Browse source 
Don't copy files twice in `CMakeLists.txt`
This commit is contained in:
Dennis Felsing 2017-10-20 14:10:57 +02:00 committed by GitHub
parent 03ec3c0145 d01c892bbd
commit 7600bed0fe
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -363,7 +363,7 @@ list(APPEND TARGETS_DEP png)
set_glob(DEP_GLEW_SRC GLOB src/engine/external/glew glew.c)
set_glob(DEP_GLEW_INCLUDES GLOB src/engine/external/glew/GL eglew.h glew.h glxew.h wglew.h)
add_library(glew OBJECT EXCLUDE_FROM_ALL ${DEP_GLEW_SRC})
add_library(glew OBJECT EXCLUDE_FROM_ALL ${DEP_GLEW_SRC} ${DEP_GLEW_INCLUDES})
target_include_directories(glew PRIVATE src/engine/external/glew)
set(DEP_GLEW $<TARGET_OBJECTS:glew>)
@ -395,10 +395,6 @@ endif()
file(COPY data DESTINATION .)
file(COPY shader DESTINATION .)
file(COPY ${CURL_COPY_FILES} DESTINATION .)
file(COPY ${FREETYPE_COPY_FILES} DESTINATION .)
file(COPY ${OPUSFILE_COPY_FILES} DESTINATION .)
file(COPY ${SDL2_COPY_FILES} DESTINATION .)
set(COPY_FILES
${CURL_COPY_FILES}
${FREETYPE_COPY_FILES}