etlegacy/Update-Installer
0
0
Fork 0
mirror of https://github.com/etlegacy/Update-Installer.git synced 2024-11-29 07:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use zlib from external/zlib to build the minizip library on Win32

Browse source
This commit is contained in:
Robert Knight 2011-08-22 16:37:53 +01:00
parent e11cc9193a
commit 6418b44924
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -5,6 +5,10 @@ cmake_minimum_required(VERSION 2.6)
include_directories(external)
include_directories(external/TinyThread/source)
if (WIN32)
include_directories(external/zlib/)
endif()
add_subdirectory(src)
add_subdirectory(external/AnyOption)
add_subdirectory(external/minizip)

11
external/minizip/CMakeLists.txt vendored
View file

@ -2,7 +2,9 @@ project(minizip)
cmake_minimum_required(VERSION 2.6)
find_package(ZLIB REQUIRED)
if (UNIX)
find_package(ZLIB REQUIRED)
endif()
set (SOURCES
ioapi.c
@ -28,5 +30,10 @@ add_library(minizip
${HEADERS}
)
target_link_libraries(minizip z)
if (UNIX)
target_link_libraries(minizip z)
else()
target_link_libraries(minizip "${CMAKE_CURRENT_SOURCE_DIR}/../zlib/zlib.lib")
endif()