diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-02-16 12:37:31 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-02-16 12:37:31 +0100 |
| commit | 2acf218700a6ae6d5cb441d1e4138b98519f6dfe (patch) | |
| tree | 89f2e452e293d50d17edb514d3b6dfedcd6f83f2 /lib/zlib | |
| parent | CHange MCADefrag CMakelist to use zlib CMakeList (diff) | |
| download | cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.tar cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.tar.gz cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.tar.bz2 cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.tar.lz cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.tar.xz cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.tar.zst cuberite-2acf218700a6ae6d5cb441d1e4138b98519f6dfe.zip | |
Diffstat (limited to 'lib/zlib')
| -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() |