← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to libmysql/CMakeLists.txt

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysql/CMakeLists.txt
71
71
                     ../strings/ctype-simple.c ../strings/ctype-sjis.c ../strings/ctype-tis620.c 
72
72
                     ../strings/ctype-uca.c ../strings/ctype-ucs2.c ../strings/ctype-ujis.c 
73
73
                     ../strings/ctype-utf8.c ../strings/ctype-win1250ch.c ../strings/ctype.c 
74
 
                     ../mysys/default.c errmsg.c ../mysys/errors.c
 
74
                     ../mysys/default.c errmsg.c ../mysys/errors.c ../mysys/my_sync.c
75
75
                     ../mysys/hash.c ../mysys/my_sleep.c ../mysys/default_modify.c
76
76
                     get_password.c ../strings/int2str.c ../strings/is_prefix.c 
77
 
                     libmysql.c ../mysys/list.c ../strings/llstr.c
 
77
                     libmysql.c ../mysys/list.c ../strings/llstr.c ../mysys/my_rnd.c
78
78
                     ../strings/longlong2str.c ../mysys/mf_arr_appstr.c ../mysys/mf_cache.c
79
79
                     ../mysys/mf_dirname.c ../mysys/mf_fn_ext.c ../mysys/mf_format.c 
80
80
                     ../mysys/mf_iocache.c ../mysys/mf_iocache2.c ../mysys/mf_loadpath.c 
98
98
                     ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c 
99
99
                     ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 
100
100
                     ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c ../mysys/mf_qsort.c
101
 
                     ../mysys/my_getsystime.c ${LIB_SOURCES})
 
101
                     ../mysys/my_getsystime.c ../mysys/my_sync.c ${LIB_SOURCES})
102
102
 
103
103
# Need to set USE_TLS for building the DLL, since __declspec(thread)
104
104
# approach to thread local storage does not work properly in DLLs.
124
124
  SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")
125
125
ENDIF(WIN32)
126
126
ADD_DEPENDENCIES(libmysql GenError)
127
 
TARGET_LINK_LIBRARIES(libmysql wsock32)
 
127
TARGET_LINK_LIBRARIES(libmysql ws2_32)
128
128
 
129
129
IF(EMBED_MANIFESTS)
130
130
  MYSQL_EMBED_MANIFEST("myTest" "asInvoker")