mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 05:13:59 +02:00
Code Issues Projects Releases Wiki Activity

cmake:use miniz if zlib isn't found

Browse Source
This commit is contained in:
andy5995
2018-09-25 13:26:03 -05:00
parent c04e75e19c
commit be8a45bca0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/shared_lib/CMakeLists.txt
View File

@@ -228,16 +228,17 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
endif() endif()
endif() endif()
######################################################################################### message(STATUS "Searching for zlib")
# zetaglest lib
include(FindZLIB) include(FindZLIB)
IF (FORCE_EMBEDDED_LIBS) IF (FORCE_EMBEDDED_LIBS OR NOT ZLIB_FOUND)
SET(DIRS_WITH_SRC SET(DIRS_WITH_SRC
${DIRS_WITH_SRC} ${DIRS_WITH_SRC}
# miniz is a library included with the ZG distribution. Not as
# developed as zlib, but smaller, and uses the same function names
# so basically a replacement for miniz. We may one day replace
# miniz with the zlib sources
miniz) miniz)
ELSE() ELSE()
message(STATUS "Searching for zlib")
if (ZLIB_FOUND) if (ZLIB_FOUND)
message(STATUS "Using external zlib") message(STATUS "Using external zlib")
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${ZLIB_LIBRARIES}) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${ZLIB_LIBRARIES})