diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2007-08-03 21:51:37 +0200 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2007-08-03 21:51:37 +0200 |
| commit | a6d082f36de35794006fd7bcb5495eeaf2dd7e82 (patch) | |
| tree | e1463cc69b98560699aa561754652f5db4e1e3a2 /zlib | |
| parent | 52f71ecc677825126699f3d682a62494a2259506 (diff) | |
| download | mariadb-git-a6d082f36de35794006fd7bcb5495eeaf2dd7e82.tar.gz | |
CMakeLists.txt, README, configure.js
Several adjustments to make client libraries pass the link test
on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index 123b7f6ec7f..43235b631f6 100755 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt @@ -18,10 +18,13 @@ # Not directly and indirectly using any of the macros for creating and # using the storage, pthread_key*(), {,my_}{set,get}_specific*() .... -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") -ADD_LIBRARY(zlib adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h +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) -
\ No newline at end of file +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(zlib ${ZLIB_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) |