Commit ee684c0f authored by unknown's avatar unknown
Browse files

WL#3201 

  cmake changes


storage/blackhole/cmakelists.txt:
  New BitKeeper file ``storage/blackhole/cmakelists.txt''
parent a7dde923

cmakelists.txt

+26 −23
Original line number Diff line number Diff line
@@ -9,52 +9,49 @@ SET(WITH_CSV_STORAGE_ENGINE TRUE) 
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in

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



SET(WITH_HEAP_STORAGE_ENGINE TRUE)

ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)

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



SET(WITH_MYISAM_STORAGE_ENGINE TRUE)

ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)

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



SET(WITH_MYISAMMRG_STORAGE_ENGINE TRUE)

ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)

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



IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &archive_hton")

  SET (mysql_se_decls "${mysql_se_decls}, archive_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_archive.cc")

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

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_BLACKHOLE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &blackhole_hton")

  SET (mysql_se_decls "${mysql_se_decls}, blackhole_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_blackhole.cc")

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

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)

IF(WITH_CSV_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_CSV_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &tina_hton")

  SET (mysql_se_decls "${mysql_se_decls}, tina_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../storage/csv/ha_tina.cc")

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

ENDIF(WITH_CSV_STORAGE_ENGINE)

IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &example_hton")

  SET (mysql_se_decls "${mysql_se_decls}, example_hton")

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

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &innobase_hton")

  SET (mysql_se_decls "${mysql_se_decls}, innobase_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_innodb.cc")

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

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

IF(WITH_PARTITION_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_PARTITION_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &partition_hton")

  SET (mysql_se_decls "${mysql_se_decls}, partition_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_partition.cc")

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

ENDIF(WITH_PARTITION_STORAGE_ENGINE)

IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &federated_hton")

  SET (mysql_se_decls "${mysql_se_decls}, federated_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_federated.cc")

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

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)

IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)

  SET (mysql_se_htons "${mysql_se_htons}, &berkeley_hton")

  SET (mysql_se_decls "${mysql_se_decls}, berkeley_hton")

  SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_berkeley.cc")

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

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)



CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in
@@ -137,6 +134,12 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) 
IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/blackhole)

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)

IF(WITH_CSV_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/csv)

ENDIF(WITH_CSV_STORAGE_ENGINE)

IF(WITH_EXAMPLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

sql/cmakelists.txt

+10 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 
							${CMAKE_SOURCE_DIR}/sql/sql_yacc.h 

							${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc

                            ${CMAKE_SOURCE_DIR}/include/mysql_version.h

                            ${CMAKE_SOURCE_DIR}/sql/handlerton.cc

                            ${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc

                            ${CMAKE_SOURCE_DIR}/sql/lex_hash.h 

                            ${PROJECT_SOURCE_DIR}/include/mysqld_error.h

                            ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
@@ -29,7 +29,8 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER 
ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc

               discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 

               filesort.cc gstream.cc  ha_heap.cc ha_myisam.cc ha_myisammrg.cc

               ${mysql_se_ha_src} handler.cc hash_filo.cc hash_filo.h 

               ha_innodb.cc ha_partition.cc ha_federated.cc ha_berkeley.cc

               handler.cc hash_filo.cc hash_filo.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
@@ -59,13 +60,19 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
			   ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h 

			   ${PROJECT_SOURCE_DIR}/include/sql_state.h

			   ${PROJECT_SOURCE_DIR}/include/mysql_version.h 

			   ${PROJECT_SOURCE_DIR}/sql/handlerton.cc

			   ${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc

			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)

TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 

                      taocrypt strings vio regex wsock32)

IF(WITH_ARCHIVE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld archive)

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld blackhole)

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)

IF(WITH_CSV_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld csv)

ENDIF(WITH_CSV_STORAGE_ENGINE)

IF(WITH_EXAMPLE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)

storage/archive/cmakelists.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 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)

ADD_LIBRARY(archive azio.c)

ADD_LIBRARY(archive azio.c ha_archive.cc ha_archive.h)

TARGET_LINK_LIBRARIES(archive zlib mysys dbug strings)

storage/blackhole/cmakelists.txt

0 → 100644
+5 −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)

ADD_LIBRARY(blackhole ha_blackhole.cc ha_blackhole.h)