diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-06-28 13:28:33 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-08-16 07:12:38 +0200 |
| commit | 1f43a43dcef50e9ab77a0468045f334b3217e5b4 (patch) | |
| tree | 5a7fc4a98698c33bf7b6bd52fef175bea8b0c9e6 | |
| parent | b75145549704e7118f7802b42d1e72ac9ff69b6f (diff) | |
| download | libgit2-1f43a43dcef50e9ab77a0468045f334b3217e5b4.tar.gz | |
cmake: move zlib build instructions into subdirectory
Extract code required to build the zlib library into its own
CMakeLists.txt, which is included as required.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | deps/zlib/CMakeLists.txt | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44ba55b2b..27f0e7823 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -484,9 +484,9 @@ IF (ZLIB_FOUND) ENDIF() ELSE() MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." ) + ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/deps/zlib" "${CMAKE_BINARY_DIR}/deps/zlib") LIST(APPEND LIBGIT2_INCLUDES "${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") + LIST(APPEND LIBGIT2_LIBS zlib) ENDIF() # Optional external dependency: libssh2 @@ -601,7 +601,7 @@ ENDIF() CONFIGURE_FILE(src/features.h.in git2/sys/features.h) -SET(GIT2INTERNAL_OBJECTS ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_SSH} ${SRC_SHA1}) +SET(GIT2INTERNAL_OBJECTS ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_SSH} ${SRC_SHA1}) LIST(APPEND LIBGIT2_INCLUDES ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/src" "${CMAKE_SOURCE_DIR}/include") diff --git a/deps/zlib/CMakeLists.txt b/deps/zlib/CMakeLists.txt new file mode 100644 index 000000000..ca50d80c4 --- /dev/null +++ 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}) |