diff options
| author | unknown <joerg@trift2.> | 2007-08-21 18:42:35 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-21 18:42:35 +0200 |
| commit | 0f866de6b1d5eaa960ef2c24e88174c3eb9da3a2 (patch) | |
| tree | bc25a306ad79301a7a627b6116ade5f297e450cb /strings | |
| parent | 0ece5608fc93d761387a0c081a255d06646a691a (diff) | |
| parent | 936f6a47fac395400e0821b3b95c6a29ea5e78a2 (diff) | |
| download | mariadb-git-0f866de6b1d5eaa960ef2c24e88174c3eb9da3a2.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
sql/log_event.cc:
Auto merged
Diffstat (limited to 'strings')
| -rwxr-xr-x | strings/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index ac7c75ec56c..3d9de566670 100755 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -17,7 +17,8 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) -ADD_LIBRARY(strings bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c + +SET(STRINGS_SOURCES bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c ctype-gb2312.c ctype-gbk.c ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c int2str.c @@ -25,3 +26,7 @@ ADD_LIBRARY(strings bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c my_strchr.c strcont.c strinstr.c strnlen.c) + +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(strings ${STRINGS_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) |