diff options
| author | jbruehe/mysqldev@mysql.com/production.mysql.com <> | 2007-08-16 18:21:47 +0200 |
|---|---|---|
| committer | jbruehe/mysqldev@mysql.com/production.mysql.com <> | 2007-08-16 18:21:47 +0200 |
| commit | 2d4efab3661f12e85b111c97a524b4d5e5b1b592 (patch) | |
| tree | 9a62f903d57f431cf953e28060ff94f1b7cfc663 /storage/heap | |
| parent | f07738caac5497de8c896670e9ea53dc5c1e5fbe (diff) | |
| parent | 0e5e36421815d2c2bc67942362bebe3a2fba6b76 (diff) | |
| download | mariadb-git-2d4efab3661f12e85b111c97a524b4d5e5b1b592.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
Diffstat (limited to 'storage/heap')
| -rwxr-xr-x | storage/heap/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt index f4732397cc4..fd3ce149b2c 100755 --- a/storage/heap/CMakeLists.txt +++ b/storage/heap/CMakeLists.txt @@ -15,16 +15,18 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -IF(EMBEDDED_ONLY) - ADD_DEFINITIONS(-DUSE_TLS) -ENDIF(EMBEDDED_ONLY) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/extra/yassl/include) -ADD_LIBRARY(heap _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c + +SET(HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c ha_heap.cc hp_delete.c hp_extra.c hp_hash.c hp_info.c hp_open.c hp_panic.c hp_rename.c hp_rfirst.c hp_rkey.c hp_rlast.c hp_rnext.c hp_rprev.c hp_rrnd.c hp_rsame.c hp_scan.c hp_static.c hp_update.c hp_write.c) + +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(heap ${HEAP_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) |