diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-20 13:46:43 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-20 13:46:43 +0400 |
| commit | 5f255b44e34b163df44f0d69375c1c14d52a2db1 (patch) | |
| tree | 2cbbd5888ed244bd7e46bff4720acb35f7831758 /storage | |
| parent | 356efddad60a9ae26f5cce3943557884d89d1f80 (diff) | |
| parent | bca54639b6b0fc3958151e0c086e1f1e4c8c9c6c (diff) | |
| download | mariadb-git-5f255b44e34b163df44f0d69375c1c14d52a2db1.tar.gz | |
Merge from mysql-trunk-merge.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index f48c4ea39b2..2dfd19ef06c 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -84,4 +84,20 @@ SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ut/ut0vec.c ut/ut0list.c ut/ut0wqueue.c) ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION) + +IF (MYSQL_VERSION_ID GREATER "50137") + IF (WITH_INNOBASE_STORAGE_ENGINE) + MYSQL_STORAGE_ENGINE(INNOBASE) + ELSE (WITH_INNOBASE_STORAGE_ENGINE) + SET (INNODB_SOURCES ${INNOBASE_SOURCES}) + MYSQL_STORAGE_ENGINE(INNODB) + ENDIF (WITH_INNOBASE_STORAGE_ENGINE) +ELSE (MYSQL_VERSION_ID GREATER "50137") + IF (NOT SOURCE_SUBLIBS) + ADD_DEFINITIONS(-D_WIN32 -DMYSQL_SERVER) + ADD_LIBRARY(innobase STATIC ${INNOBASE_SOURCES}) + # Require mysqld_error.h, which is built as part of the GenError + ADD_DEPENDENCIES(innobase GenError) + ENDIF (NOT SOURCE_SUBLIBS) +ENDIF (MYSQL_VERSION_ID GREATER "50137") MYSQL_STORAGE_ENGINE(INNOBASE) |