diff options
| author | andrew <xdotftw@gmail.com> | 2014-02-20 14:37:15 +0100 |
|---|---|---|
| committer | andrew <xdotftw@gmail.com> | 2014-02-20 14:37:15 +0100 |
| commit | 83d3a2eedf88a3a180b9dfc4c706838d7f99382a (patch) | |
| tree | d96970727615c681efe3bf76793015cead438394 /lib/zlib | |
| parent | cMapDecorator: Implemented random rotations (diff) | |
| parent | APIDump: Fixed cBlockArea:GetRelBlockType() return types. (diff) | |
| download | cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.tar cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.tar.gz cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.tar.bz2 cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.tar.lz cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.tar.xz cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.tar.zst cuberite-83d3a2eedf88a3a180b9dfc4c706838d7f99382a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | lib/zlib/CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/zlib/CMakeLists.txt b/lib/zlib/CMakeLists.txt index b1b74031d..6c52578ee 100644 --- a/lib/zlib/CMakeLists.txt +++ b/lib/zlib/CMakeLists.txt @@ -8,12 +8,14 @@ file(GLOB SOURCE "*.c" ) -add_library(zlib ${SOURCE}) +if(NOT TARGET zlib) + add_library(zlib ${SOURCE}) -if (MSVC) - # Remove SCL warnings, we expect this library to have been tested safe - SET_TARGET_PROPERTIES( - zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS" - ) + if (MSVC) + # Remove SCL warnings, we expect this library to have been tested safe + SET_TARGET_PROPERTIES( + zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS" + ) + endif() endif() |