1 files changed, 34 insertions, 30 deletions
diff --git a/dep/zlib/CMakeLists.txt b/dep/zlib/CMakeLists.txt
index 6b2af4c987a..93d569e1a09 100644
--- a/dep/zlib/CMakeLists.txt
+++ b/dep/zlib/CMakeLists.txt
@@ -22,39 +22,43 @@ if(UNIX)
         "${ZLIB_INCLUDE_DIRS}")
 else()
   # Use the bundled source on windows
-  SET(zlib_STAT_SRCS
-    adler32.c
-    compress.c
-    crc32.c
-    crc32.h
-    deflate.c
-    deflate.h
-    gzguts.h
-    infback.c
-    inffast.c
-    inffast.h
-    inffixed.h
-    inflate.c
-    inflate.h
-    inftrees.c
-    inftrees.h
-    trees.c
-    trees.h
-    uncompr.c
-    zconf.h
-    zlib.h 
-    zutil.c
-    zutil.h
-  )
+  add_library(zlib STATIC)
 
-  add_library(zlib STATIC
-    ${zlib_STAT_SRCS})
-
-  set_target_properties(zlib PROPERTIES LINKER_LANGUAGE CXX)
+  target_sources(zlib
+    PRIVATE
+      adler32.c
+      compress.c
+      crc32.c
+      deflate.c
+      infback.c
+      inffast.c
+      inflate.c
+      inftrees.c
+      trees.c
+      uncompr.c
+      zutil.c)
 
-  target_include_directories(zlib
+  target_sources(zlib
     PUBLIC
-      ${CMAKE_CURRENT_SOURCE_DIR})
+      FILE_SET HEADERS
+      FILES
+        zlib.h
+    PRIVATE
+      FILE_SET zlib_private_headers
+      TYPE HEADERS
+      FILES
+        crc32.h
+        deflate.h
+        gzguts.h
+        inffast.h
+        inffixed.h
+        inflate.h
+        inftrees.h
+        trees.h
+        zconf.h
+        zutil.h)
+
+  set_target_properties(zlib PROPERTIES LINKER_LANGUAGE CXX)
 
   target_link_libraries(zlib
     PRIVATE