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.


client/CMakeLists.txt:
  - Removed code duplication by moving build of "mysqlclient" to
    the "libmysql" directory
  - Link clients with the new "mysqlclient_notls", to protect for
    the case the clients use more than the client API, and access
    thread data directly.
  - Synced explicit target addition of sources with Unix.
dbug/CMakeLists.txt:
  No need to set CXX flags, no C++ code
libmysql/CMakeLists.txt:
  - Aligned more with Unix version when it comes to included source files
  - Build both DLL and static library in this directory
  - Produce separe static TLS version of the static client library, for
     use when building clients in this build that might access TLS
     storage directly.
mysys/CMakeLists.txt:
  We only have to build the static TLS version, as no clients are
  linking directly with the "mysys" library.
scripts/make_win_bin_dist:
  Ajusted paths to new "mysqlclient.lib" location in source tree
sql/CMakeLists.txt:
  Removed duplicate "ha_blackhole.cc" in file listing
  Removed explicit link to "dbug.lib" not needed
  Link with the static TLS "mysqlclient_notls"
tests/CMakeLists.txt:
  Removed explicit link to "dbug", "mysys", "yassl", "taocrypt" and
  "zlib" not needed.
  Added explicit source addition "../mysys/my_memmem.c".
  No need for setting CXX flags, no C++ code.
  Use the static TLS "mysqlclient_notls" for linkage.
zlib/CMakeLists.txt:
  No need for a dynamic TLS version of this library, no access to thread
  storage is done from it. Also no need to define MYSQL_CLIENT, not used,
  or __WIN32__ that is handled by the library header without this define.

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)