2006-12-31 02:29:11 +01:00
|
|
|
# Copyright (C) 2006 MySQL AB
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; version 2 of the License.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
|
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
2007-04-23 22:23:32 +02:00
|
|
|
INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
|
2006-12-31 02:29:11 +01:00
|
|
|
|
Bug#473914: mysql_client_test fail with in debug compilaton on windows x64
Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC
flag, while anything else is compiled with SAFEMALLOC.
As a consequence, my_hash_init used inside federatedx initialization does not
provide correct caller info parameters (file, line) , so they are initialized with
whatever is on stack. When info about allocated memory is output in
COM_DEBUG command, the server crashes trying to output string starting at
0xcccccccccccccccc.
The fix is to remove SAFEMALLOC preprocessor flags
from every CMakeLists.txt, except the top-level one.
Also, SAFEMALLOC is not defined by default now, instead
there is WITH_DEBUG_FULL CMake option which adds
-DSAFEMALLOC to C and C++ flags in debug compilation.
This option is off by default, because
1) Debug C runtime already has heap debugging builtin with
overwrite and leak detection
2)safemalloc considerably slows down the tests.
Note also that
- SAFEMALLOC is gone in MySQL5.5
- On Windows, heap related overflows can also be found using free pageheap utility
(that is also part of application verifier). This is even more efficient if there are no other layers
on top of Windows heap allocator, e.g it is most efficient with release version.
2010-12-06 12:52:06 +01:00
|
|
|
ADD_DEFINITIONS(-DUSE_SYMDIR)
|
2006-01-31 14:52:16 +01:00
|
|
|
|
2006-02-08 18:18:17 +01:00
|
|
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
|
|
|
|
${CMAKE_SOURCE_DIR}/extra/yassl/include
|
|
|
|
${CMAKE_SOURCE_DIR}/sql
|
|
|
|
${CMAKE_SOURCE_DIR}/regex
|
2006-03-23 16:34:52 +01:00
|
|
|
${CMAKE_SOURCE_DIR}/zlib
|
2011-01-29 18:51:12 +01:00
|
|
|
${CMAKE_SOURCE_DIR}/extra/libevent
|
|
|
|
${CMAKE_BINARY_DIR}/extra/libevent
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}
|
2006-08-14 23:45:48 +02:00
|
|
|
)
|
2006-01-31 14:52:16 +01:00
|
|
|
|
2011-01-29 18:51:12 +01:00
|
|
|
SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/sql/sql_yacc.h
|
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
|
|
|
|
${CMAKE_BINARY_DIR}/include/mysql_version.h
|
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
|
|
|
|
${CMAKE_BINARY_DIR}/sql/lex_hash.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/mysqld_error.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/mysqld_ername.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/sql_state.h
|
2006-03-28 18:05:25 +02:00
|
|
|
PROPERTIES GENERATED 1)
|
2006-03-27 23:19:56 +02:00
|
|
|
|
2008-05-12 18:34:25 +02:00
|
|
|
ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN -DHAVE_EVENT_SCHEDULER)
|
2006-01-31 14:52:16 +01:00
|
|
|
|
2009-06-10 10:59:49 +02:00
|
|
|
|
|
|
|
SET (SQL_SOURCE
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
../sql-common/client.c derror.cc des_key_file.cc
|
2008-06-18 18:17:15 +02:00
|
|
|
discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
|
2006-08-20 02:38:42 +02:00
|
|
|
filesort.cc gstream.cc
|
2006-09-07 21:34:12 +02:00
|
|
|
ha_partition.cc
|
2010-03-03 15:44:14 +01:00
|
|
|
handler.cc hash_filo.cc hash_filo.h sql_plugin_services.h
|
2006-03-28 18:05:25 +02:00
|
|
|
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
|
|
|
|
item_create.cc item_func.cc item_geofunc.cc item_row.cc
|
|
|
|
item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
|
2010-04-26 23:59:50 +02:00
|
|
|
key.cc log.cc lock.cc
|
2007-06-12 09:38:30 +02:00
|
|
|
log_event.cc rpl_record.cc rpl_reporting.cc
|
2007-04-12 15:50:54 +02:00
|
|
|
log_event_old.cc rpl_record_old.cc
|
2006-03-28 18:05:25 +02:00
|
|
|
message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
|
2010-03-29 17:13:53 +02:00
|
|
|
mysqld.cc net_serv.cc ../sql-common/client_plugin.c
|
2006-03-28 18:05:25 +02:00
|
|
|
nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc
|
|
|
|
../sql-common/pack.c parse_file.cc password.c procedure.cc
|
|
|
|
protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc
|
|
|
|
slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc
|
|
|
|
sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc
|
|
|
|
sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h
|
|
|
|
sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc
|
2009-12-21 03:26:15 +01:00
|
|
|
sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc
|
2010-09-28 10:19:50 +02:00
|
|
|
sql_lifo_buffer.h
|
2010-11-19 20:03:03 +01:00
|
|
|
sql_join_cache.h sql_join_cache.cc
|
|
|
|
sql_lex.cc sql_list.cc sql_load.cc sql_manager.cc
|
2009-12-21 03:26:15 +01:00
|
|
|
sql_map.cc sql_parse.cc sql_partition.cc sql_plugin.cc
|
|
|
|
sql_prepare.cc sql_rename.cc
|
2009-09-29 17:38:40 +02:00
|
|
|
debug_sync.cc debug_sync.h
|
2006-03-28 18:05:25 +02:00
|
|
|
sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc
|
|
|
|
sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
|
|
|
|
sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc
|
|
|
|
time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc
|
2006-06-27 08:48:50 +02:00
|
|
|
rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_data_objects.cc
|
|
|
|
event_queue.cc event_db_repository.cc
|
2006-06-08 23:07:11 +02:00
|
|
|
sql_tablespace.cc events.cc ../sql-common/my_user.c
|
2006-09-11 10:19:11 +02:00
|
|
|
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
|
2006-12-18 22:39:50 +01:00
|
|
|
rpl_rli.cc rpl_mi.cc sql_servers.cc
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
sql_connect.cc scheduler.cc
|
2009-06-25 12:05:53 +02:00
|
|
|
sql_profile.cc event_parse_data.cc opt_table_elimination.cc
|
2010-06-26 12:05:41 +02:00
|
|
|
multi_range_read.cc
|
2010-06-26 23:00:34 +02:00
|
|
|
opt_subselect.cc
|
2010-06-27 07:52:14 +02:00
|
|
|
opt_index_cond_pushdown.cc
|
2010-04-08 14:10:05 +02:00
|
|
|
create_options.cc
|
2010-07-10 12:37:30 +02:00
|
|
|
sql_expression_cache.cc
|
2011-01-29 18:51:12 +01:00
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
|
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_yacc.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/mysqld_error.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/mysqld_ername.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/sql_state.h
|
|
|
|
${CMAKE_BINARY_DIR}/include/mysql_version.h
|
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
|
|
|
|
${CMAKE_BINARY_DIR}/sql/lex_hash.h)
|
2011-03-11 15:20:24 +01:00
|
|
|
|
2009-06-10 10:59:49 +02:00
|
|
|
ADD_LIBRARY(sql ${SQL_SOURCE})
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
|
2011-01-29 18:51:12 +01:00
|
|
|
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/win/cmake/dummy.in cmake_dummy.cc COPYONLY)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqld cmake_dummy.cc message.rc DESTINATION ${INSTALL_SBINDIR} COMPONENT Server)
|
|
|
|
INSTALL_DEBUG_TARGET(mysqld
|
|
|
|
DESTINATION ${INSTALL_SBINDIR}
|
|
|
|
PDB_DESTINATION ${INSTALL_SBINDIR}/debug
|
|
|
|
RENAME mysqld-debug)
|
2007-04-23 22:23:32 +02:00
|
|
|
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
|
2009-06-10 10:59:49 +02:00
|
|
|
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
|
|
|
|
|
2009-09-15 00:45:48 +02:00
|
|
|
SET (MYSQLD_CORE_LIBS mysys zlib dbug strings yassl taocrypt vio regex sql libevent)
|
2009-06-10 10:59:49 +02:00
|
|
|
TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_CORE_LIBS} ${MYSQLD_STATIC_ENGINE_LIBS})
|
2010-01-29 19:42:22 +01:00
|
|
|
TARGET_LINK_LIBRARIES(mysqld ws2_32.lib psapi.lib)
|
2009-06-10 10:59:49 +02:00
|
|
|
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
|
2009-06-10 10:59:49 +02:00
|
|
|
IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
|
|
|
|
# Set module definition file. Also use non-incremental linker,
|
|
|
|
# incremental appears to crash from time to time,if used with /DEF option
|
|
|
|
SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "/DEF:mysqld.def /INCREMENTAL:NO")
|
|
|
|
|
|
|
|
FOREACH (CORELIB ${MYSQLD_CORE_LIBS})
|
|
|
|
GET_TARGET_PROPERTY(LOC ${CORELIB} LOCATION)
|
|
|
|
FILE(TO_NATIVE_PATH ${LOC} LOC)
|
|
|
|
SET (LIB_LOCATIONS ${LIB_LOCATIONS} ${LOC})
|
|
|
|
ENDFOREACH (CORELIB ${MYSQLD_CORE_LIBS})
|
|
|
|
|
|
|
|
ADD_CUSTOM_COMMAND(TARGET mysqld PRE_LINK
|
|
|
|
COMMAND cscript ARGS //nologo ${PROJECT_SOURCE_DIR}/win/create_def_file.js
|
|
|
|
${PLATFORM} ${LIB_LOCATIONS} > mysqld.def
|
2011-01-29 18:51:12 +01:00
|
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
2009-06-10 10:59:49 +02:00
|
|
|
ENDIF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
|
|
|
|
|
|
|
|
ADD_DEPENDENCIES(sql GenError)
|
2006-01-31 14:52:16 +01:00
|
|
|
|
|
|
|
# Sql Parser custom command
|
|
|
|
ADD_CUSTOM_COMMAND(
|
2011-01-29 18:51:12 +01:00
|
|
|
OUTPUT ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
|
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
|
2009-06-10 10:59:49 +02:00
|
|
|
COMMAND bison ARGS -y -p MYSQL --defines=sql_yacc.h
|
2011-01-29 18:51:12 +01:00
|
|
|
--output=sql_yacc.cc "${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy"
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)
|
2006-01-31 14:52:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
# Gen_lex_hash
|
|
|
|
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
|
2009-09-01 13:59:54 +02:00
|
|
|
TARGET_LINK_LIBRARIES(gen_lex_hash debug dbug mysqlclient strings wsock32)
|
2006-01-31 14:52:16 +01:00
|
|
|
GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
|
|
|
|
ADD_CUSTOM_COMMAND(
|
2011-01-29 18:51:12 +01:00
|
|
|
OUTPUT ${CMAKE_BINARY_DIR}/sql/lex_hash.h
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h
|
|
|
|
DEPENDS ${GEN_LEX_HASH_EXE})
|
|
|
|
|
|
|
|
ADD_CUSTOM_TARGET(
|
|
|
|
GenServerSource ALL
|
2011-01-29 18:51:12 +01:00
|
|
|
DEPENDS ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
|
|
|
|
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
|
|
|
|
${CMAKE_BINARY_DIR}/sql/lex_hash.h)
|
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
2007-08-06 23:16:01 +02:00
|
|
|
|
2011-02-21 20:17:26 +01:00
|
|
|
ADD_DEPENDENCIES(sql GenServerSource)
|
2006-02-07 16:43:42 +01:00
|
|
|
|
2007-07-27 23:41:34 +02:00
|
|
|
# Remove the auto-generated files as part of 'Clean Solution'
|
|
|
|
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
|
2009-06-10 10:59:49 +02:00
|
|
|
"lex_hash.h;sql_yacc.h;sql_yacc.cc;mysqld.def")
|
2006-09-21 15:19:20 +02:00
|
|
|
|
|
|
|
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
|
2008-01-30 03:58:57 +01:00
|
|
|
ADD_DEPENDENCIES(udf_example strings GenError)
|
2007-08-29 22:29:07 +02:00
|
|
|
TARGET_LINK_LIBRARIES(udf_example strings wsock32)
|
2010-06-25 15:09:45 +02:00
|
|
|
|
2011-01-29 18:51:12 +01:00
|
|
|
ADD_SUBDIRECTORY(share)
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
|
|
|
|
FILE(TO_NATIVE_PATH ${my_bootstrap_sql} native_outfile)
|
|
|
|
|
|
|
|
# Create bootstrapper SQL script
|
|
|
|
ADD_CUSTOM_COMMAND(OUTPUT
|
|
|
|
${my_bootstrap_sql}
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_SOURCE_DIR}/scripts
|
|
|
|
cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql ${native_outfile}
|
|
|
|
DEPENDS
|
|
|
|
${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables.sql
|
|
|
|
${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables_data.sql
|
|
|
|
${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql
|
|
|
|
)
|
|
|
|
|
|
|
|
ADD_CUSTOM_COMMAND(
|
|
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_bootstrap_sql.c
|
|
|
|
COMMAND comp_sql
|
|
|
|
mysql_bootstrap_sql
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql
|
|
|
|
mysql_bootstrap_sql.c
|
|
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
|
|
DEPENDS comp_sql ${my_bootstrap_sql})
|
|
|
|
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_install_db
|
|
|
|
mysql_install_db.cc
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/mysql_bootstrap_sql.c
|
|
|
|
COMPONENT Server)
|
|
|
|
TARGET_LINK_LIBRARIES(mysql_install_db mysys strings dbug)
|
|
|
|
|
2011-01-30 22:27:59 +01:00
|
|
|
ADD_LIBRARY(winservice STATIC winservice.c)
|
|
|
|
|
2011-01-29 18:51:12 +01:00
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade_service
|
|
|
|
mysql_upgrade_service.cc
|
|
|
|
COMPONENT Server)
|
2011-01-30 22:27:59 +01:00
|
|
|
|
|
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys strings dbug winservice)
|
2011-01-29 18:51:12 +01:00
|
|
|
|
|
|
|
# mysql_install_db should be in the same directory as mysqld
|
|
|
|
# to work correctly
|
|
|
|
GET_TARGET_PROPERTY(MYSQLD_EXECUTABLE mysqld LOCATION)
|
|
|
|
IF(NOT MYSQLD_EXECUTABLE)
|
|
|
|
MESSAGE(FATAL_ERROR "Unexpected")
|
|
|
|
ENDIF()
|
|
|
|
ENDIF()
|
|
|
|
|
|
|
|
# We need to create empty directories (data/test) the installation.
|
|
|
|
# This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
|
|
|
|
# Avoid completely empty directories and install dummy file instead.
|
|
|
|
SET(DUMMY_FILE ${CMAKE_CURRENT_BINARY_DIR}/.empty )
|
|
|
|
FILE(WRITE ${DUMMY_FILE} "")
|
|
|
|
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/test COMPONENT DataFiles)
|
|
|
|
|
|
|
|
# Install initial database on windows
|
|
|
|
IF(NOT CMAKE_CROSSCOMPILING)
|
|
|
|
GET_TARGET_PROPERTY(MYSQLD_EXECUTABLE mysqld LOCATION)
|
|
|
|
ENDIF()
|
|
|
|
IF(WIN32 AND MYSQLD_EXECUTABLE)
|
|
|
|
CONFIGURE_FILE(
|
|
|
|
${CMAKE_SOURCE_DIR}/win/cmake/create_initial_db.cmake.in
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/create_initial_db.cmake
|
|
|
|
@ONLY
|
|
|
|
)
|
|
|
|
|
|
|
|
IF(MSVC_IDE OR CMAKE_GENERATOR MATCHES "Xcode")
|
|
|
|
SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
|
|
|
|
ENDIF()
|
|
|
|
MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/data)
|
|
|
|
ADD_CUSTOM_COMMAND(
|
|
|
|
OUTPUT initdb.dep
|
|
|
|
COMMAND ${CMAKE_COMMAND}
|
|
|
|
${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_initial_db.cmake
|
|
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
|
|
|
|
DEPENDS mysqld
|
|
|
|
)
|
|
|
|
ADD_CUSTOM_TARGET(initial_database
|
|
|
|
ALL
|
|
|
|
DEPENDS initdb.dep
|
|
|
|
)
|
|
|
|
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data DESTINATION .
|
|
|
|
COMPONENT DataFiles PATTERN "initdb.dep" EXCLUDE PATTERN "bootstrap.sql" EXCLUDE)
|
|
|
|
ELSE()
|
|
|
|
# Not windows or cross compiling, just install an empty directory
|
|
|
|
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
|
|
|
|
ENDIF()
|