Add CMake targets for missing stuff for release build. (b5246481) · Commits · Software / OSDI20 Artifacts / mariadb

win/cmakefiles/base

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,4 +32,5 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu
		ADD_DEFINITIONS("-D_WINDOWS -D__WIN__")

		SUBDIRS(vio dbug strings regex mysys extra zlib storage/innobase storage/heap storage/myisam storage/myisammrg
		extra/yassl extra/yassl/taocrypt client sql server-tools/instance-manager)
		extra/yassl extra/yassl/taocrypt client sql server-tools/instance-manager
		libmysql tests)

win/cmakefiles/client

+4 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		# The old Windows build method used renamed (.cc -> .cpp) source files, fails
		# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define.
		ADD_DEFINITIONS(-DUSE_TLS -DUSING_CMAKE)
		ADD_DEFINITIONS(-DUSING_CMAKE)
		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/zlib
		${CMAKE_SOURCE_DIR}/extra/yassl/include
		@@ -75,3 +75,6 @@ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl zlib wsock32)

		ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
		TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32)

		ADD_EXECUTABLE(mysqlslap mysqlslap.c)
		TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32)

win/cmakefiles/deploy.bat

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,3 +17,5 @@ copy innobase ..\..\storage\innobase\cmakelists.txt
		copy myisam ..\..\storage\myisam\cmakelists.txt
		copy myisammrg ..\..\storage\myisammrg\cmakelists.txt
		copy im ..\..\server-tools\instance-manager\cmakelists.txt
		copy libmysql ..\..\libmysql\cmakelists.txt
		copy tests ..\..\tests\cmakelists.txt

win/cmakefiles/extra

+6 −0

Original line number	Diff line number	Diff line
		@@ -21,3 +21,9 @@ ADD_CUSTOM_TARGET(GenError

		ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
		TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32)

		ADD_EXECUTABLE(perror perror.c)
		TARGET_LINK_LIBRARIES(perror strings mysys dbug wsock32)

		ADD_EXECUTABLE(replace replace.c)
		TARGET_LINK_LIBRARIES(replace strings mysys dbug wsock32)

win/cmakefiles/libmysql

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/zlib
		${CMAKE_SOURCE_DIR}/extra/yassl/include
		${CMAKE_SOURCE_DIR}/libmysql
		${CMAKE_SOURCE_DIR}/regex
		${CMAKE_SOURCE_DIR}/sql
		${CMAKE_SOURCE_DIR}/strings)

		ADD_LIBRARY(libmysql MODULE dll.c libmysql.def
		../mysys/array.c ../strings/bchange.c ../strings/bmove.c
		../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
		../sql-common/client.c ../strings/ctype-big5.c ../strings/ctype-bin.c
		../strings/ctype-cp932.c ../strings/ctype-czech.c ../strings/ctype-euc_kr.c
		../strings/ctype-eucjpms.c ../strings/ctype-extra.c ../strings/ctype-gb2312.c
		../strings/ctype-gbk.c ../strings/ctype-latin1.c ../strings/ctype-mb.c
		../strings/ctype-simple.c ../strings/ctype-sjis.c ../strings/ctype-tis620.c
		../strings/ctype-uca.c ../strings/ctype-ucs2.c ../strings/ctype-ujis.c
		../strings/ctype-utf8.c ../strings/ctype-win1250ch.c ../strings/ctype.c
		../mysys/default.c ../libmysql/errmsg.c ../mysys/errors.c
		../libmysql/get_password.c ../strings/int2str.c ../strings/is_prefix.c
		../libmysql/libmysql.c ../mysys/list.c ../strings/llstr.c
		../strings/longlong2str.c ../libmysql/manager.c ../mysys/mf_cache.c
		../mysys/mf_dirname.c ../mysys/mf_fn_ext.c ../mysys/mf_format.c
		../mysys/mf_iocache.c ../mysys/mf_iocache2.c ../mysys/mf_loadpath.c
		../mysys/mf_pack.c ../mysys/mf_path.c ../mysys/mf_tempfile.c ../mysys/mf_unixpath.c
		../mysys/mf_wcomp.c ../mysys/mulalloc.c ../mysys/my_access.c ../mysys/my_alloc.c
		../mysys/my_chsize.c ../mysys/my_compress.c ../mysys/my_create.c
		../mysys/my_delete.c ../mysys/my_div.c ../mysys/my_error.c ../mysys/my_file.c
		../mysys/my_fopen.c ../mysys/my_fstream.c ../mysys/my_gethostbyname.c
		../mysys/my_getopt.c ../mysys/my_getwd.c ../mysys/my_init.c ../mysys/my_lib.c
		../mysys/my_malloc.c ../mysys/my_messnc.c ../mysys/my_net.c ../mysys/my_once.c
		../mysys/my_open.c ../mysys/my_pread.c ../mysys/my_pthread.c ../mysys/my_read.c
		../mysys/my_realloc.c ../mysys/my_rename.c ../mysys/my_seek.c
		../mysys/my_static.c ../strings/my_strtoll10.c ../mysys/my_symlink.c
		../mysys/my_symlink2.c ../mysys/my_thr_init.c ../sql-common/my_time.c
		../strings/my_vsnprintf.c ../mysys/my_wincond.c ../mysys/my_winthread.c
		../mysys/my_write.c ../sql/net_serv.cc ../sql-common/pack.c ../sql/password.c
		../mysys/safemalloc.c ../mysys/sha1.c ../strings/str2int.c
		../strings/str_alloc.c ../strings/strcend.c ../strings/strcont.c ../strings/strend.c
		../strings/strfill.c ../mysys/string.c ../strings/strinstr.c ../strings/strmake.c
		../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c
		../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c
		../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c
		../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c)
		ADD_DEPENDENCIES(libmysql GenError zlib)
		TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)

		# ToDo: We should move the mytest.c program out in libmysql/
		ADD_EXECUTABLE(myTest ../VC++Files/libmysqltest/mytest.c)
		TARGET_LINK_LIBRARIES(myTest libmysql)