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

2016-08-09 19:10:38 -04:00 · 2016-08-09 19:10:38 -04:00 · b9092c94f5
parent aa47484b2a
commit b9092c94f5
1 changed files with 5 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -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()
+    if(NOT APPLE AND DFHACK_BUILD_32)
+        # 32-bit Linux
        set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
+    endif()
 endif()

 find_package(ZLIB REQUIRED)