diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-08-11 18:05:25 +0500 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-08-11 18:05:25 +0500 |
| commit | 24e418df6937109bd8167561f46822f02942e375 (patch) | |
| tree | 51c420178316e108b0380d5666aadf5881384c5a /libmysqld | |
| parent | c1433ba201f6532aeb36b6ac2cf6718f2665aaa3 (diff) | |
| parent | 94efc1c6b084ed531b513e70fb66e7b7a1186b56 (diff) | |
| download | mariadb-git-24e418df6937109bd8167561f46822f02942e375.tar.gz | |
Merge mysql-5.1-innodb_plugin to mysql-5.1.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 59 |
1 files changed, 6 insertions, 53 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1c8f80768d4..8500d73863a 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -87,63 +87,16 @@ FOREACH(rpath ${VIO_SOURCES}) SET(LIB_SOURCES ${LIB_SOURCES} ../vio/${rpath}) ENDFOREACH(rpath) -# Engines -INCLUDE(${CMAKE_SOURCE_DIR}/storage/heap/CMakeLists.txt) -FOREACH(rpath ${HEAP_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/heap/${rpath}) -ENDFOREACH(rpath) - -INCLUDE(${CMAKE_SOURCE_DIR}/storage/myisam/CMakeLists.txt) -FOREACH(rpath ${MYISAM_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/myisam/${rpath}) -ENDFOREACH(rpath) -INCLUDE(${CMAKE_SOURCE_DIR}/storage/myisammrg/CMakeLists.txt) -FOREACH(rpath ${MYISAMMRG_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/myisammrg/${rpath}) -ENDFOREACH(rpath) -IF(WITH_ARCHIVE_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/archive/CMakeLists.txt) - FOREACH(rpath ${ARCHIVE_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/archive/${rpath}) +FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS}) + INCLUDE(${CMAKE_SOURCE_DIR}/storage/${ENGINE_LIB}/CMakeLists.txt) + STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER) + FOREACH(rpath ${${ENGINE_LIB_UPPER}_SOURCES}) + SET(LIB_SOURCES ${LIB_SOURCES} ${CMAKE_SOURCE_DIR}/storage/${ENGINE_LIB}/${rpath}) ENDFOREACH(rpath) -ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) +ENDFOREACH(ENGINE_LIB) -IF(WITH_BLACKHOLE_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/blackhole/CMakeLists.txt) - FOREACH(rpath ${BLACKHOLE_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/blackhole/${rpath}) - ENDFOREACH(rpath) -ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE) - -IF(WITH_EXAMPLE_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/example/CMakeLists.txt) - FOREACH(rpath ${EXAMPLE_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/example/${rpath}) - ENDFOREACH(rpath) -ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) - -IF(WITH_FEDERATED_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/federated/CMakeLists.txt) - FOREACH(rpath ${FEDERATED_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/federated/${rpath}) - ENDFOREACH(rpath) -ENDIF(WITH_FEDERATED_STORAGE_ENGINE) - -IF(WITH_INNOBASE_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/innobase/CMakeLists.txt) - FOREACH(rpath ${INNOBASE_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/innobase/${rpath}) - ENDFOREACH(rpath) -ENDIF(WITH_INNOBASE_STORAGE_ENGINE) - -IF(WITH_CSV_STORAGE_ENGINE) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/csv/CMakeLists.txt) - FOREACH(rpath ${CSV_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ../storage/csv/${rpath}) - ENDFOREACH(rpath) -ENDIF(WITH_CSV_STORAGE_ENGINE) SET(SOURCE_SUBLIBS FALSE) |