summaryrefslogtreecommitdiffstats
path: root/lib/zlib/CMakeLists.txt
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2015-11-04 22:32:11 +0100
committerJulian Laubstein <julianlaubstein@yahoo.de>2015-11-04 23:25:00 +0100
commit9a7dd0a0770178529c704c08bc446e3533b1f3e5 (patch)
tree2ef6b11f07074c22d44b7f2396e3a96562376974 /lib/zlib/CMakeLists.txt
parentMerge pull request #2597 from cuberite/faviconChange (diff)
downloadcuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.tar
cuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.tar.gz
cuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.tar.bz2
cuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.tar.lz
cuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.tar.xz
cuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.tar.zst
cuberite-9a7dd0a0770178529c704c08bc446e3533b1f3e5.zip
Diffstat (limited to 'lib/zlib/CMakeLists.txt')
m---------lib/zlib0
-rw-r--r--lib/zlib/CMakeLists.txt22
2 files changed, 0 insertions, 22 deletions
diff --git a/lib/zlib b/lib/zlib
new file mode 160000
+Subproject aae8d8238798ea8ba2004631112d74c82d4021b
diff --git a/lib/zlib/CMakeLists.txt b/lib/zlib/CMakeLists.txt
deleted file mode 100644
index 74cf94f8b..000000000
--- a/lib/zlib/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-cmake_minimum_required (VERSION 2.6)
-project (zlib)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
-
-file(GLOB SOURCE
- "*.c"
- "*.h"
-)
-
-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"
- )
- endif()
-endif()
-