From 852cc9119e6a805d47b4c6646d6d09050bc25949 Mon Sep 17 00:00:00 2001 From: KimLS Date: Sun, 25 Aug 2019 15:49:00 -0700 Subject: [PATCH] Small change to zlibng --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 737721fe7..4f97c7aa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,16 +241,16 @@ IF(ZLIB_FOUND) IF(EQEMU_BUILD_ZLIB) SET(ZLIB_LIBRARY_TYPE "zlib-ng") 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() - SET(ZLIB_LIBRARY_TYPE " zlib") + SET(ZLIB_LIBRARY_TYPE " zlib") SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY}) SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS}) ENDIF() ELSE() SET(ZLIB_LIBRARY_TYPE "zlib-ng") 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() MESSAGE(STATUS "") @@ -262,7 +262,7 @@ MESSAGE(STATUS "* TLS: ${TLS_LIBRARY_TYPE} *") MESSAGE(STATUS "* Sodium: ${SODIUM_LIBRARY_TYPE} *") MESSAGE(STATUS "* Lua: ${LUA_LIBRARY_TYPE} *") MESSAGE(STATUS "* Perl: ${PERL_LIBRARY_TYPE} *") -MESSAGE(STATUS "* zlib: ${ZLIB_LIBRARY_TYPE} *") +MESSAGE(STATUS "* zlib: ${ZLIB_LIBRARY_TYPE} *") MESSAGE(STATUS "**************************************************") #setup server libs and headers @@ -331,7 +331,7 @@ IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_H IF(EQEMU_BUILD_ZLIB) SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API") SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries") - ADD_SUBDIRECTORY(submodules/zlibng) + ADD_SUBDIRECTORY(libs/zlibng) ENDIF() SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")