Commit 73ca6fc5 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
parents 2c4a003e 05dead9b

CMakeLists.txt

0 → 100755
+132 −0
Original line number Diff line number Diff line 
PROJECT(MySql)



# This reads user configuration, generated by configure.js.

INCLUDE(win/configure.data)



CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in

               ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)



# Set standard options

ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)

ADD_DEFINITIONS(-D CMAKE_BUILD)

ADD_DEFINITIONS(-D HAVE_YASSL)



SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")





IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_ARCHIVE_DB)

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)



IF (WITH_HEAP_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")

ENDIF (WITH_HEAP_STORAGE_ENGINE)



IF (WITH_MYISAMMRG_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")

ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)



IF(WITH_INNOBASE_STORAGE_ENGINE)

  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in

               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)

  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)



IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)

  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)



IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_BERKELEY_DB)

  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)



IF (WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_BLACKHOLE_DB)

ENDIF (WITH_BLACKHOLE_STORAGE_ENGINE)



SET(localstatedir "C:\\mysql\\data")

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-innodb-heavy-4G.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-innodb-heavy-4G.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-large.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-large.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-medium.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-medium.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)



IF(__NT__)

  ADD_DEFINITIONS(-D __NT__)

ENDIF(__NT__)

IF(CYBOZU)

  ADD_DEFINITIONS(-D CYBOZU)

ENDIF(CYBOZU)



# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

   CMAKE_GENERATOR MATCHES "Visual Studio 8")

	# replace /MDd with /MTd

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT 

	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT 

	       ${CMAKE_C_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 

	       ${CMAKE_C_FLAGS_RELEASE})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 

	       ${CMAKE_C_FLAGS_DEBUG})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 

	       ${CMAKE_CXX_FLAGS_RELEASE})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})



	# remove support for Exception handling

	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT 

	       ${CMAKE_CXX_FLAGS_INIT})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT 

	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

      CMAKE_GENERATOR MATCHES "Visual Studio 8")



ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")



ADD_SUBDIRECTORY(vio)

ADD_SUBDIRECTORY(dbug)

ADD_SUBDIRECTORY(strings)

ADD_SUBDIRECTORY(regex)

ADD_SUBDIRECTORY(mysys)

ADD_SUBDIRECTORY(extra/yassl)

ADD_SUBDIRECTORY(extra/yassl/taocrypt)

ADD_SUBDIRECTORY(extra)

ADD_SUBDIRECTORY(zlib)

ADD_SUBDIRECTORY(heap)

ADD_SUBDIRECTORY(myisam)

ADD_SUBDIRECTORY(myisammrg)

ADD_SUBDIRECTORY(client)

ADD_SUBDIRECTORY(bdb)

ADD_SUBDIRECTORY(innobase)

ADD_SUBDIRECTORY(sql)

ADD_SUBDIRECTORY(sql/examples)

ADD_SUBDIRECTORY(server-tools/instance-manager)

ADD_SUBDIRECTORY(libmysql)

ADD_SUBDIRECTORY(tests)

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \

			README COPYING EXCEPTIONS-CLIENT

			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \
@@ -33,7 +33,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
			@thread_dirs@ pstack \

			@sql_union_dirs@ scripts @man_dirs@ tests SSL\

			BUILD netware os2 @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@

			@bench_dirs@ support-files @tools_dirs@ win



# Run these targets before any others, also make part of clean target,

# to make sure we create new links after a clean.

bdb/CMakeLists.txt

0 → 100755
+44 −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}/bdb/build_win32

                    ${CMAKE_SOURCE_DIR}/bdb/dbinc

                    ${CMAKE_SOURCE_DIR}/bdb)



# BDB needs a number of source files that are auto-generated by the unix

# configure. So to build BDB, it is necessary to copy these over to the Windows

# bitkeeper tree, or to use a source .tar.gz package which already has these

# files.

ADD_LIBRARY(bdb btree/bt_compare.c btree/bt_conv.c btree/bt_curadj.c btree/bt_cursor.c

			btree/bt_delete.c btree/bt_method.c btree/bt_open.c btree/bt_put.c btree/bt_rec.c

			btree/bt_reclaim.c btree/bt_recno.c btree/bt_rsearch.c btree/bt_search.c

			btree/bt_split.c btree/bt_stat.c btree/bt_upgrade.c btree/bt_verify.c btree/btree_auto.c

			db/crdel_auto.c db/crdel_rec.c db/db.c db/db_am.c db/db_auto.c common/db_byteorder.c

			db/db_cam.c db/db_conv.c db/db_dispatch.c db/db_dup.c common/db_err.c common/db_getlong.c

			common/db_idspace.c db/db_iface.c db/db_join.c common/db_log2.c db/db_meta.c

			db/db_method.c db/db_open.c db/db_overflow.c db/db_pr.c db/db_rec.c db/db_reclaim.c

			db/db_remove.c db/db_rename.c db/db_ret.c env/db_salloc.c env/db_shash.c db/db_truncate.c

			db/db_upg.c db/db_upg_opd.c db/db_vrfy.c db/db_vrfyutil.c dbm/dbm.c dbreg/dbreg.c

			dbreg/dbreg_auto.c dbreg/dbreg_rec.c dbreg/dbreg_util.c env/env_file.c env/env_method.c

			env/env_open.c env/env_recover.c env/env_region.c fileops/fileops_auto.c fileops/fop_basic.c

			fileops/fop_rec.c fileops/fop_util.c hash/hash.c hash/hash_auto.c hash/hash_conv.c

			hash/hash_dup.c hash/hash_func.c hash/hash_meta.c hash/hash_method.c hash/hash_open.c

			hash/hash_page.c hash/hash_rec.c  hash/hash_reclaim.c hash/hash_stat.c hash/hash_upgrade.c

			hash/hash_verify.c hmac/hmac.c hsearch/hsearch.c lock/lock.c lock/lock_deadlock.c

			lock/lock_method.c lock/lock_region.c lock/lock_stat.c lock/lock_util.c log/log.c

			log/log_archive.c log/log_compare.c log/log_get.c log/log_method.c log/log_put.c

			mp/mp_alloc.c mp/mp_bh.c mp/mp_fget.c mp/mp_fopen.c mp/mp_fput.c

			mp/mp_fset.c mp/mp_method.c mp/mp_region.c mp/mp_register.c mp/mp_stat.c mp/mp_sync.c

			mp/mp_trickle.c mutex/mut_tas.c mutex/mut_win32.c mutex/mutex.c os_win32/os_abs.c

			os/os_alloc.c os_win32/os_clock.c os_win32/os_config.c os_win32/os_dir.c os_win32/os_errno.c

			os_win32/os_fid.c os_win32/os_fsync.c os_win32/os_handle.c os/os_id.c os_win32/os_map.c

			os/os_method.c os/os_oflags.c os_win32/os_open.c os/os_region.c os_win32/os_rename.c

			os/os_root.c os/os_rpath.c os_win32/os_rw.c os_win32/os_seek.c os_win32/os_sleep.c

			os_win32/os_spin.c os_win32/os_stat.c os/os_tmpdir.c os_win32/os_type.c os/os_unlink.c

			qam/qam.c qam/qam_auto.c qam/qam_conv.c qam/qam_files.c qam/qam_method.c qam/qam_open.c

			qam/qam_rec.c qam/qam_stat.c qam/qam_upgrade.c qam/qam_verify.c rep/rep_method.c

			rep/rep_record.c rep/rep_region.c rep/rep_util.c hmac/sha1.c

			clib/strcasecmp.c txn/txn.c txn/txn_auto.c txn/txn_method.c txn/txn_rec.c

			txn/txn_recover.c txn/txn_region.c txn/txn_stat.c txn/txn_util.c common/util_log.c

			common/util_sig.c xa/xa.c xa/xa_db.c xa/xa_map.c)

bdb/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ 
# distdir and top_distdir are set by the calling Makefile



bdb_build = build_unix

files = LICENSE Makefile Makefile.in README

files = LICENSE Makefile Makefile.in README CMakeLists.txt

subdirs = btree build_vxworks build_win32 clib common cxx db dbinc \

  dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \

  db_dump185 db_load db_printlog db_recover db_stat db_upgrade \

client/CMakeLists.txt

0 → 100755
+79 −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")



# 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(-DUSING_CMAKE)

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}/mysys

                    ${CMAKE_SOURCE_DIR}/sql

                    ${CMAKE_SOURCE_DIR}/strings)



ADD_LIBRARY(mysqlclient ../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(mysqlclient GenError)

ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)

LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib)

TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl taocrypt zlib dbug wsock32)



ADD_EXECUTABLE(mysqltest mysqltest.c)

TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl taocrypt zlib dbug regex wsock32)



ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)

TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)

TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlimport mysqlimport.c)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlshow mysqlshow.c)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc

                           ../mysys/my_bit.c ../mysys/my_bitmap.c 

                           ../mysys/base64.c)

TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqladmin mysqladmin.cc)

TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl taocrypt zlib wsock32)