mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 10:31:29 +00:00
Small change to zlibng
This commit is contained in:
parent
72a922f2ba
commit
852cc9119e
@ -241,7 +241,7 @@ IF(ZLIB_FOUND)
|
|||||||
IF(EQEMU_BUILD_ZLIB)
|
IF(EQEMU_BUILD_ZLIB)
|
||||||
SET(ZLIB_LIBRARY_TYPE "zlib-ng")
|
SET(ZLIB_LIBRARY_TYPE "zlib-ng")
|
||||||
SET(ZLIB_LIBRARY_LIBS "zlibstatic")
|
SET(ZLIB_LIBRARY_LIBS "zlibstatic")
|
||||||
SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlibng")
|
SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(ZLIB_LIBRARY_TYPE " zlib")
|
SET(ZLIB_LIBRARY_TYPE " zlib")
|
||||||
SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
|
SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
|
||||||
@ -250,7 +250,7 @@ IF(ZLIB_FOUND)
|
|||||||
ELSE()
|
ELSE()
|
||||||
SET(ZLIB_LIBRARY_TYPE "zlib-ng")
|
SET(ZLIB_LIBRARY_TYPE "zlib-ng")
|
||||||
SET(ZLIB_LIBRARY_LIBS "zlibstatic")
|
SET(ZLIB_LIBRARY_LIBS "zlibstatic")
|
||||||
SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlibng")
|
SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
MESSAGE(STATUS "")
|
MESSAGE(STATUS "")
|
||||||
@ -331,7 +331,7 @@ IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_H
|
|||||||
IF(EQEMU_BUILD_ZLIB)
|
IF(EQEMU_BUILD_ZLIB)
|
||||||
SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
|
SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
|
||||||
SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
|
SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
|
||||||
ADD_SUBDIRECTORY(submodules/zlibng)
|
ADD_SUBDIRECTORY(libs/zlibng)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
|
SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user