WL#3201

  cmake changes


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

1 files changed, 26 insertions, 23 deletions

diff --git a/cmakelists.txt b/cmakelists.txt
index 0e91f49be90..28d75c62c41 100644
--- a/cmakelists.txt
+++ b/cmakelists.txt
@@ -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)