diff options
| author | unknown <acurtis/antony@xiphis.org/ltantony.xiphis.org> | 2006-08-24 22:10:55 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltantony.xiphis.org> | 2006-08-24 22:10:55 -0700 |
| commit | cf9d738b6214afe33389798bd196b0205f09b3b8 (patch) | |
| tree | 10cf85c6fccc323cd58e0e82f80dbaf9a8ba5542 /libmysqld | |
| parent | 4ec86b1c0453c18092a9f66292b19afbceadd9dc (diff) | |
| download | mariadb-git-cf9d738b6214afe33389798bd196b0205f09b3b8.tar.gz | |
fix for windows build
CMakeLists.txt:
add for federated
libmysqld/CMakeLists.txt:
ha_heap.cc and ha_myisam.cc are removed
add for federated
sql/CMakeLists.txt:
add for federated
sql/handler.cc:
fix for fussy compilers
storage/heap/CMakeLists.txt:
add ha_heap.cc
storage/myisammrg/CMakeLists.txt:
add ha_myisammrg.cc
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 804ab4ad3f2..d752d905568 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -30,8 +30,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc - ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc - ../sql/ha_myisammrg.cc ${mysql_se_ha_src} + ../sql/gstream.cc ${mysql_se_ha_src} ../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 @@ -80,6 +79,9 @@ ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) IF(WITH_EXAMPLE_STORAGE_ENGINE) ADD_DEPENDENCIES(mysqlserver example) ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) +IF(WITH_FEDERATED_STORAGE_ENGINE) + ADD_DEPENDENCIES(mysqlserver federated) +ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) ADD_DEPENDENCIES(mysqlserver innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) |