#At file:///export/home/didrik/repo/trunk-cmake-embedded/ based on revid:marc.alff@stripped
3594 Tor Didriksen 2011-02-02
Bug #59867 Cleanup cmake files for mysqld and embedded
Create one common list representing (most of) the source files which
are common to mysqld and the embedded server.
@ libmysqld/CMakeLists.txt
Import most of the sql sources from SQL_EXPORTED_SOURCES, set in sql/CMakeLists.txt
Some cosmetics (indentation)
@ sql/CMakeLists.txt
Sort list of source files alphabetically.
Remove all .h files
Export SQL_EXPORTED_SOURCES so it can be used to build the embedded server.
Some cosmetics (indentation)
modified:
libmysqld/CMakeLists.txt
sql/CMakeLists.txt
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt 2010-12-17 09:41:21 +0000
+++ b/libmysqld/CMakeLists.txt 2011-02-02 08:30:13 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
#
# 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
@@ -17,81 +17,55 @@ ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDE
${SSL_DEFINES})
INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_SOURCE_DIR}/libmysql
-${CMAKE_SOURCE_DIR}/libmysqld
-${CMAKE_SOURCE_DIR}/sql
-${CMAKE_BINARY_DIR}/sql
-${CMAKE_SOURCE_DIR}/regex
-${ZLIB_INCLUDE_DIR}
-${SSL_INCLUDE_DIRS}
-${SSL_INTERNAL_INCLUDE_DIRS}
-${CMAKE_SOURCE_DIR}/sql/backup
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/libmysql
+ ${CMAKE_SOURCE_DIR}/libmysqld
+ ${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_BINARY_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/regex
+ ${ZLIB_INCLUDE_DIR}
+ ${SSL_INCLUDE_DIRS}
+ ${SSL_INTERNAL_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/sql/backup
)
SET(GEN_SOURCES
-${CMAKE_BINARY_DIR}/sql/sql_yacc.h
-${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
-${CMAKE_BINARY_DIR}/sql/lex_hash.h
+ ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
+ ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
+ ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
+ ${CMAKE_BINARY_DIR}/sql/lex_hash.h
)
SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED TRUE)
-SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
- ../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
- ../sql-common/client.c ../sql-common/my_time.c
- ../sql-common/my_user.c ../sql-common/pack.c
- ../sql-common/client_plugin.c
- ../sql/password.c ../sql/discover.cc ../sql/derror.cc
- ../sql/field.cc ../sql/field_conv.cc
- ../sql/filesort_utils.cc
- ../sql/filesort.cc ../sql/gstream.cc
- ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc
- ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc
- ../sql/item.cc ../sql/item_create.cc ../sql/item_func.cc
- ../sql/item_geofunc.cc ../sql/item_row.cc ../sql/item_strfunc.cc
- ../sql/item_subselect.cc ../sql/item_sum.cc ../sql/item_timefunc.cc
- ../sql/item_xmlfunc.cc ../sql/key.cc ../sql/lock.cc ../sql/log.cc
- ../sql/log_event.cc ../sql/mf_iocache.cc ../sql/my_decimal.cc
- ../sql/net_serv.cc ../sql/opt_range.cc ../sql/opt_sum.cc
- ../sql/parse_file.cc ../sql/procedure.cc ../sql/protocol.cc
- ../sql/records.cc ../sql/rpl_filter.cc
- ../sql/rpl_record.cc ../sql/sha2.cc ../sql/des_key_file.cc
- ../sql/rpl_injector.cc ../sql/set_var.cc ../sql/spatial.cc
- ../sql/sp_cache.cc ../sql/sp.cc ../sql/sp_head.cc
- ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc ../sql/sql_acl.cc
- ../sql/sql_alloc_error_handler.cc
- ../sql/sql_analyse.cc ../sql/sql_base.cc ../sql/sql_cache.cc
- ../sql/sql_class.cc ../sql/sql_crypt.cc ../sql/sql_cursor.cc
- ../sql/sql_db.cc ../sql/sql_delete.cc ../sql/sql_derived.cc
- ../sql/sql_do.cc ../sql/sql_error.cc ../sql/sql_handler.cc
- ../sql/sql_help.cc ../sql/sql_insert.cc ../sql/sql_join_cache.cc
- ../sql/datadict.cc ../sql/sql_admin.cc ../sql/sql_truncate.cc
- ../sql/sql_reload.cc
- ../sql/sql_lex.cc ../sql/keycaches.cc
- ../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc
- ../sql/sql_binlog.cc ../sql/sql_manager.cc
- ../sql/sql_parse.cc ../sql/sql_partition.cc ../sql/sql_plugin.cc
- ../sql/debug_sync.cc
- ../sql/sql_prepare.cc ../sql/sql_rename.cc
- ../sql/sql_select.cc ../sql/sql_servers.cc
- ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
- ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
- ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
- ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc
- ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
- ../sql/sql_time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
- ../sql/partition_info.cc ../sql/sql_connect.cc
- ../sql/scheduler.cc ../sql/sql_audit.cc
- ../sql/sql_alter.cc ../sql/sql_partition_admin.cc
- ../sql/event_parse_data.cc
- ../sql/sql_signal.cc ../sql/rpl_handler.cc
- ../sql/rpl_utility.cc ../sql/rpl_reporting.cc ../sql/binlog.cc
- ../sql/sys_vars.cc ../sql/gcalc_slicescan.cc ../sql/gcalc_tools.cc
- ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
- ../sql/mdl.cc ../sql/transaction.cc ../sql/sql_bootstrap.cc
- ${GEN_SOURCES}
- ${MYSYS_LIBWRAP_SOURCE}
+FOREACH(file ${SQL_EXPORTED_SOURCES})
+ LIST(APPEND IMPORTED_SOURCES "../sql/${file}")
+ENDFOREACH()
+
+SET(SQL_EMBEDDED_SOURCES
+ emb_qcache.cc
+ lib_sql.cc
+ libmysqld.c
+ ${GEN_SOURCES}
+ ${MYSYS_LIBWRAP_SOURCE}
+ ../client/get_password.c
+ ../libmysql/errmsg.c
+ ../libmysql/libmysql.c
+ ../sql-common/client.c
+ ../sql-common/client_plugin.c
+ ../sql-common/my_time.c
+ ../sql-common/my_user.c
+ ../sql-common/pack.c
+ ../sql/binlog.cc
+ ../sql/event_parse_data.cc
+ ../sql/hash_filo.cc
+ ../sql/log_event.cc
+ ../sql/rpl_filter.cc
+ ../sql/rpl_injector.cc
+ ../sql/rpl_record.cc
+ ../sql/rpl_reporting.cc
+ ../sql/rpl_utility.cc
+ ${IMPORTED_SOURCES}
)
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt 2011-01-03 13:12:01 +0000
+++ b/sql/CMakeLists.txt 2011-02-02 08:30:13 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
#
# 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
@@ -14,19 +14,19 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_SOURCE_DIR}/sql
-${CMAKE_SOURCE_DIR}/regex
-${ZLIB_INCLUDE_DIR}
-${SSL_INCLUDE_DIRS}
-${CMAKE_BINARY_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/regex
+ ${ZLIB_INCLUDE_DIR}
+ ${SSL_INCLUDE_DIRS}
+ ${CMAKE_BINARY_DIR}/sql
)
SET(GEN_SOURCES
-${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h
-${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
-${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
-${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
+ ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
)
SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED 1)
@@ -36,52 +36,142 @@ IF(SSL_DEFINES)
ADD_DEFINITIONS(${SSL_DEFINES})
ENDIF()
+SET(SQL_SHARED_SOURCES
+ datadict.cc
+ debug_sync.cc
+ derror.cc
+ des_key_file.cc
+ discover.cc
+ field.cc
+ field_conv.cc
+ filesort.cc
+ filesort_utils.cc
+ gcalc_slicescan.cc
+ gcalc_tools.cc
+ gstream.cc
+ handler.cc
+ 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
+ item_xmlfunc.cc
+ key.cc
+ keycaches.cc
+ lock.cc
+ log.cc
+ mdl.cc
+ mf_iocache.cc
+ my_decimal.cc
+ net_serv.cc
+ opt_range.cc
+ opt_sum.cc
+ parse_file.cc
+ partition_info.cc
+ password.c
+ procedure.cc
+ protocol.cc
+ records.cc
+ rpl_handler.cc
+ scheduler.cc
+ set_var.cc
+ sha2.cc
+ sp.cc
+ sp_cache.cc
+ sp_head.cc
+ sp_pcontext.cc
+ sp_rcontext.cc
+ spatial.cc
+ sql_acl.cc
+ sql_admin.cc
+ sql_alloc_error_handler.cc
+ sql_alter.cc
+ sql_analyse.cc
+ sql_audit.cc
+ sql_base.cc
+ sql_bootstrap.cc
+ sql_cache.cc
+ sql_class.cc
+ sql_connect.cc
+ sql_crypt.cc
+ sql_cursor.cc
+ sql_db.cc
+ sql_delete.cc
+ sql_derived.cc
+ sql_do.cc
+ sql_error.cc
+ sql_handler.cc
+ sql_help.cc
+ sql_insert.cc
+ sql_join_cache.cc
+ sql_lex.cc
+ sql_list.cc
+ sql_load.cc
+ sql_locale.cc
+ sql_manager.cc
+ sql_parse.cc
+ sql_partition.cc
+ sql_partition_admin.cc
+ sql_plugin.cc
+ sql_prepare.cc
+ sql_profile.cc
+ sql_reload.cc
+ sql_rename.cc
+ sql_select.cc
+ sql_servers.cc
+ sql_show.cc
+ sql_signal.cc
+ sql_state.c
+ sql_string.cc
+ sql_table.cc
+ sql_tablespace.cc
+ sql_test.cc
+ sql_time.cc
+ sql_trigger.cc
+ sql_truncate.cc
+ sql_udf.cc
+ sql_union.cc
+ sql_update.cc
+ sql_view.cc
+ strfunc.cc
+ sys_vars.cc
+ table.cc
+ thr_malloc.cc
+ transaction.cc
+ tztime.cc
+ uniques.cc
+ unireg.cc
+)
+
+SET(SQL_EXPORTED_SOURCES ${SQL_SHARED_SOURCES} PARENT_SCOPE)
-SET (SQL_SOURCE
- ../sql-common/client.c derror.cc des_key_file.cc
- discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
- filesort_utils.cc
- filesort.cc gstream.cc sha2.cc
- handler.cc hash_filo.h sql_plugin_services.h
- 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
- key.cc log.cc lock.cc
- message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
- mysqld.cc net_serv.cc keycaches.cc
- ../sql-common/client_plugin.c
- opt_range.cc opt_range.h opt_sum.cc
- ../sql-common/pack.c parse_file.cc password.c procedure.cc
- protocol.cc records.cc set_var.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
- sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc
- sql_list.cc sql_load.cc sql_manager.cc sql_parse.cc
- sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc
- sql_join_cache.cc debug_sync.cc debug_sync.h
- 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
- sql_time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc
- event_scheduler.cc event_data_objects.cc
- event_queue.cc event_db_repository.cc
- sql_tablespace.cc events.cc ../sql-common/my_user.c
- partition_info.cc sql_locale.cc
- sql_servers.cc sql_audit.cc
- sql_connect.cc scheduler.cc
- sql_profile.cc event_parse_data.cc
- sql_bootstrap.cc
- sql_signal.cc mdl.cc
- gcalc_slicescan.cc gcalc_tools.cc
- sql_alloc_error_handler.cc
- transaction.cc sys_vars.cc rpl_handler.cc sql_truncate.cc
- datadict.cc sql_reload.cc
- sql_partition_admin.cc
- sql_admin.cc sql_alter.cc
- ${GEN_SOURCES}
- ${MYSYS_LIBWRAP_SOURCE})
+SET(SQL_SOURCE
+ ${GEN_SOURCES}
+ ${MYSYS_LIBWRAP_SOURCE}
+ ${SQL_SHARED_SOURCES}
+ ../libmysql/errmsg.c
+ ../sql-common/client.c
+ ../sql-common/client_plugin.c
+ ../sql-common/my_time.c
+ ../sql-common/my_user.c
+ ../sql-common/pack.c
+ event_data_objects.cc
+ event_db_repository.cc
+ event_parse_data.cc
+ event_queue.cc
+ event_scheduler.cc
+ events.cc
+ mysqld.cc
+ sql_client.cc
+ )
MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY
RECOMPILE_FOR_EMBEDDED)
Attachment: [text/bzr-bundle] bzr/tor.didriksen@oracle.com-20110202083013-5ml5a09v0t5c25ik.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk branch (tor.didriksen:3594) Bug#59867 | Tor Didriksen | 4 Feb |
