cmake: split up zlib

pks-t · pks-t · commit a79ba77ab465 · 2017-06-28T16:37:13.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -452,9 +452,7 @@ IF (ZLIB_FOUND)
 	ENDIF()
 ELSE()
 	MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." )
-	INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/zlib")
-	ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
-	FILE(GLOB SRC_ZLIB "${CMAKE_SOURCE_DIR}/deps/zlib/*.c" "${CMAKE_SOURCE_DIR}/deps/zlib/*.h")
+	SET(USE_BUNDLED_ZLIB 1)
 ENDIF()
 
 # Optional external dependency: libssh2
@@ -580,6 +578,12 @@ IF(USE_BUNDLED_REGEX)
 	LIST(APPEND LIBGIT2_LIBS regex)
 ENDIF()
 
+IF(USE_BUNDLED_ZLIB)
+	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/deps/zlib")
+	INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/zlib")
+	LIST(APPEND LIBGIT2_LIBS zlib)
+ENDIF()
+
 IF(USE_BUNDLED_HTTP_PARSER)
 	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/deps/http-parser")
 	INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/http-parser")
diff --git a/deps/zlib/CMakeLists.txt b/deps/zlib/CMakeLists.txt
@@ -0,0 +1,4 @@
+ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
+FILE(GLOB SRC_ZLIB "*.c" "*.h")
+INCLUDE_DIRECTORIES(".")
+ADD_LIBRARY(zlib STATIC ${SRC_ZLIB})
