pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for build zlib option when not using vcpkg

Browse Source
This commit is contained in:
Uleat 2019-07-13 00:43:56 -04:00
parent 87b1d32ce8
commit eb8cd1a5b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -313,7 +313,7 @@ IF(ZLIB_FOUND)
OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF) OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF)
IF(EQEMU_BUILD_ZLIB) IF(EQEMU_BUILD_ZLIB)
INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng") INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic") SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
ELSE() ELSE()
INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}") INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}")

2
libs/zlibng/CMakeLists.txt
View File

@ -861,5 +861,5 @@ if (ZLIB_ENABLE_TESTS)
endif() endif()
endif() endif()
FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES) # FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES)