CMakeLists.txt: Fix a couple of uninitialized variables

This commit is contained in:
heinrich5991 2017-03-02 11:46:00 +01:00
parent 98f3c82c29
commit a7e68fbf1b

View file

@ -47,6 +47,8 @@ find_package(Curl)
find_package(Freetype)
if(MYSQL)
find_package(MySQL)
else()
set(MYSQL_LIBRARIES)
endif()
find_package(Ogg)
find_package(Opus)
@ -119,6 +121,8 @@ if(NOT(ZLIB_FOUND))
file(GLOB ZLIB_SRC "src/engine/external/zlib/*.c" "src/engine/external/zlib/*.h")
add_library(zlib OBJECT ${ZLIB_SRC})
set(ZLIB $<TARGET_OBJECTS:zlib>)
else()
set(ZLIB)
endif()
########################################################################
@ -177,6 +181,8 @@ file(GLOB DEP_MD5 "src/engine/external/md5/*.c" "src/engine/external/md5/*.h")
if(WEBSOCKETS)
file(GLOB DEP_WEBSOCKETS "src/engine/external/libwebsockets/*.c" "src/engine/external/libwebsockets/*.h")
add_definitions(-DWEBSOCKETS)
else()
set(DEP_WEBSOCKETS)
endif()
set(DEPS ${DEP_MD5} ${DEP_WEBSOCKETS})
@ -316,7 +322,6 @@ foreach(T ${TOOLS})
)
if(TOOL MATCHES "^(tileset_|dilate$)")
target_sources(${TOOL} PRIVATE ${DEP_PNG})
message(STATUS ${TOOL})
endif()
if(TOOL MATCHES "^config_")
target_sources(${TOOL} PRIVATE "src/tools/config_common.h")