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 /storage/myisammrg | |
| 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 'storage/myisammrg')
| -rwxr-xr-x | storage/myisammrg/CMakeLists.txt | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt index 1c94e2bd50c..60cfffc67ff 100755 --- a/storage/myisammrg/CMakeLists.txt +++ b/storage/myisammrg/CMakeLists.txt @@ -12,14 +12,10 @@ # 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 - 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) +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") SET(MYISAMMRG_SOURCES myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myrg_info.c ha_myisammrg.cc @@ -28,7 +24,4 @@ SET(MYISAMMRG_SOURCES myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myr myrg_rprev.c myrg_rrnd.c myrg_rsame.c myrg_static.c myrg_update.c myrg_write.c myrg_records.c) -IF(NOT SOURCE_SUBLIBS) - ADD_LIBRARY(myisammrg ${MYISAMMRG_SOURCES}) - ADD_DEPENDENCIES(myisammrg GenError) -ENDIF(NOT SOURCE_SUBLIBS) +MYSQL_STORAGE_ENGINE(MYISAMMRG) |