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 | 7a77e3d05a55c16445e2bbf9bdfb1928dcf2bc27 (patch) | |
| tree | 51c420178316e108b0380d5666aadf5881384c5a /storage/myisam | |
| parent | 21539aa01077eda1027fc90c1d575bd3affe75a7 (diff) | |
| parent | 01dbe984f8987e6f198b8b31175c4c68e7072c49 (diff) | |
| download | mariadb-git-7a77e3d05a55c16445e2bbf9bdfb1928dcf2bc27.tar.gz | |
Merge mysql-5.1-innodb_plugin to mysql-5.1.
Diffstat (limited to 'storage/myisam')
| -rwxr-xr-x | storage/myisam/CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt index fdc0b64f86a..c05e0046e64 100755 --- a/storage/myisam/CMakeLists.txt +++ b/storage/myisam/CMakeLists.txt @@ -12,16 +12,12 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") 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 - ${CMAKE_SOURCE_DIR}/sql - ${CMAKE_SOURCE_DIR}/regex - ${CMAKE_SOURCE_DIR}/extra/yassl/include) - SET(MYISAM_SOURCES ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c ft_stem.c ha_myisam.cc ft_stopwords.c ft_update.c mi_cache.c mi_changed.c mi_check.c @@ -34,11 +30,9 @@ SET(MYISAM_SOURCES ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c mi_unique.c mi_update.c mi_write.c rt_index.c rt_key.c rt_mbr.c rt_split.c sort.c sp_key.c ft_eval.h myisamdef.h rt_index.h mi_rkey.c) -IF(NOT SOURCE_SUBLIBS) - - ADD_LIBRARY(myisam ${MYISAM_SOURCES}) - ADD_DEPENDENCIES(myisam GenError) +MYSQL_STORAGE_ENGINE(MYISAM) +IF(NOT SOURCE_SUBLIBS) ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c) TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32) |