diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2007-08-02 12:49:27 +0200 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2007-08-02 12:49:27 +0200 |
| commit | 74267ad9b83266a860a6e370cf22c64a56e1333d (patch) | |
| tree | 57bf393f7a2f1a8b24ee5f13e2347f0c49854f67 /zlib | |
| parent | 88ef9a421440eec1621de6e45be3746d6377f97d (diff) | |
| download | mariadb-git-74267ad9b83266a860a6e370cf22c64a56e1333d.tar.gz | |
CMakeLists.txt (several), make_win_bin_dist:
Aligned client library build and use with the Unix version when it
comes to what source to include directly in the builds, and what
libraries to link with (bug#30118).
Also reviewed, corrected and made more clear when static or dynamic
Thread Local Storage is to be used. Some code duplication was removed,
and some redundant library usage were removed, reducing the risk of
incorrect TLS usage.
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index ac315b0dd85..123b7f6ec7f 100755 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt @@ -13,10 +13,14 @@ # 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*() .... + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") -ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_CLIENT -D__WIN32__) ADD_LIBRARY(zlib 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) |