summaryrefslogtreecommitdiff
path: root/zlib/CMakeLists.txt
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2009-11-09 12:32:48 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2009-11-09 12:32:48 +0100
commit13cd7170ccadbc596146175c0674956f49aed830 (patch)
treeef650a7fd633d354f237aa267a871fce11fe48d3 /zlib/CMakeLists.txt
parent411a6bfeb94e89f4cd4b8daaee96fe1913218a85 (diff)
downloadmariadb-git-13cd7170ccadbc596146175c0674956f49aed830.tar.gz
WL#5161 : Cross-platform build with CMake
Diffstat (limited to 'zlib/CMakeLists.txt')
-rwxr-xr-xzlib/CMakeLists.txt17
1 files changed, 7 insertions, 10 deletions
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index 43235b631f6..2d0706d024e 100755
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt
@@ -13,18 +13,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# Note that this library is not using any "Thread Local Storage" (TLS),
-# i.e. no data declared "__declspec(thread)" or allocated with TlsAlloc().
-# Not directly and indirectly using any of the macros for creating and
-# using the storage, pthread_key*(), {,my_}{set,get}_specific*() ....
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib)
-
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+INCLUDE_DIRECTORIES(
+${CMAKE_SOURCE_DIR}/include
+${CMAKE_SOURCE_DIR}/zlib
+)
SET(ZLIB_SOURCES adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h
inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h zlib.h
zutil.c zutil.h)
-IF(NOT SOURCE_SUBLIBS)
- ADD_LIBRARY(zlib ${ZLIB_SOURCES})
-ENDIF(NOT SOURCE_SUBLIBS)
+USE_ABSOLUTE_FILENAMES(ZLIB_SOURCES)
+ADD_LIBRARY(zlib ${ZLIB_SOURCES})
+