Temporarily revert "Upgrade bundled zlib to 1.2.5."

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afa082cceba2c621993842d02a5950444acac52f..2e6f1a3db69272d1383e45f5e7da06e73894167b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,20 @@ if (ZLIB_FOUND)
     include_directories (${ZLIB_INCLUDE_DIRS})
     link_libraries (${ZLIB_LIBRARIES})
 else (ZLIB_FOUND)
-    add_subdirectory (zlib)
+    add_library (zlib STATIC
+        zlib/adler32.c
+        zlib/compress.c
+        zlib/crc32.c
+        zlib/gzio.c
+        zlib/uncompr.c
+        zlib/deflate.c
+        zlib/trees.c
+        zlib/zutil.c
+        zlib/inflate.c
+        zlib/infback.c
+        zlib/inftrees.c
+        zlib/inffast.c
+    )
     include_directories (zlib)
     link_libraries (zlib)
 endif (ZLIB_FOUND)