Merge remote-tracking branch 'github/master' into d2d

[apitrace] / thirdparty / zlib / CMakeLists.txt

diff --git a/thirdparty/zlib/CMakeLists.txt b/thirdparty/zlib/CMakeLists.txt
index 1721574e450803f09928fcb79964f1088e71a942..b1e953d12bac221e6da86380bc4221c9129dd02a 100644 (file)
--- a/thirdparty/zlib/CMakeLists.txt
+++ b/thirdparty/zlib/CMakeLists.txt
@@ -1,6 +1,13 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
-add_definitions(-DNO_VIZ)
+add_definitions (-DNO_VIZ)
+
+# adjust warnings
+if (MSVC)
+    add_definitions (-wd4131) # uses old-style declarator
+else ()
+    add_definitions (-DHAVE_UNISTD_H)
+endif ()
 
 add_library (z_bundled STATIC
     adler32.c