mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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.
This commit is contained in:
@ -287,7 +287,7 @@ cp include/mysql.h \
|
||||
mkdir -p $DESTDIR/lib/opt
|
||||
cp libmysql/$TARGET/libmysql.dll \
|
||||
libmysql/$TARGET/libmysql.lib \
|
||||
client/$TARGET/mysqlclient.lib \
|
||||
libmysql/$TARGET/mysqlclient.lib \
|
||||
regex/$TARGET/regex.lib \
|
||||
strings/$TARGET/strings.lib \
|
||||
zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
|
||||
@ -297,7 +297,7 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
|
||||
mkdir -p $DESTDIR/lib/debug
|
||||
cp libmysql/debug/libmysql.dll \
|
||||
libmysql/debug/libmysql.lib \
|
||||
client/debug/mysqlclient.lib \
|
||||
libmysql/debug/mysqlclient.lib \
|
||||
regex/debug/regex.lib \
|
||||
strings/debug/strings.lib \
|
||||
zlib/debug/zlib.lib $DESTDIR/lib/debug/
|
||||
|
Reference in New Issue
Block a user