Mercurial > hg > orthanc
diff Resources/CMake/ZlibConfiguration.cmake @ 102:7593b57dc1bf
switch to google log
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 03 Oct 2012 16:28:13 +0200 |
| parents | 74156c8b6f00 |
| children | b45bc565d82a 61ab5fa36754 |
line wrap: on
line diff
--- a/Resources/CMake/ZlibConfiguration.cmake Wed Oct 03 11:44:46 2012 +0200 +++ b/Resources/CMake/ZlibConfiguration.cmake Wed Oct 03 16:28:13 2012 +0200 @@ -1,17 +1,17 @@ -SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7) -DownloadPackage("http://zlib.net/zlib-1.2.7.tar.gz" "${ZLIB_SOURCES_DIR}" "${ZLIB_PRELOADED}" "") - -include_directories( - ${ZLIB_SOURCES_DIR} - ) - # This is the minizip distribution to create ZIP files list(APPEND THIRD_PARTY_SOURCES - ${ZLIB_SOURCES_DIR}/contrib/minizip/ioapi.c - ${ZLIB_SOURCES_DIR}/contrib/minizip/zip.c + ${CMAKE_SOURCE_DIR}/Resources/minizip/ioapi.c + ${CMAKE_SOURCE_DIR}/Resources/minizip/zip.c ) if (${STATIC_BUILD}) + SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7) + DownloadPackage("http://zlib.net/zlib-1.2.7.tar.gz" "${ZLIB_SOURCES_DIR}" "${ZLIB_PRELOADED}" "") + + include_directories( + ${ZLIB_SOURCES_DIR} + ) + list(APPEND THIRD_PARTY_SOURCES ${ZLIB_SOURCES_DIR}/adler32.c ${ZLIB_SOURCES_DIR}/compress.c