MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't search for 32-bit zlib when targeting 64-bit Linux

develop
lethosor 2016-08-09 19:10:38 -04:00
parent aa47484b2a
commit b9092c94f5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
Unescape Escape View File

@ -267,9 +267,12 @@ endif()
# find and make available libz
if(NOT UNIX) # Windows
# zlib is in here so 32-bit and 64-bit builds in the same source tree are possible
SET(ZLIB_ROOT ${CMAKE_BINARY_DIR}/depends/zlib/)
set(ZLIB_ROOT ${CMAKE_BINARY_DIR}/depends/zlib/)
else()
set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
if(NOT APPLE AND DFHACK_BUILD_32)
# 32-bit Linux
set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
endif()
endif()
find_package(ZLIB REQUIRED)