diff options
| author | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
|---|---|---|
| committer | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
| commit | 6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729 (patch) | |
| tree | 9a62f903d57f431cf953e28060ff94f1b7cfc663 /regex | |
| parent | c492a2392e283b6448cac2b3813b5a8b3906df93 (diff) | |
| parent | 1c47af79da738cbba009d2801da0cfb8ee45a3da (diff) | |
| download | mariadb-git-6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/log_event.cc:
Manual merge, later version of the fix takes precedence.
Diffstat (limited to 'regex')
| -rwxr-xr-x | regex/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt index 9b95c9d2bc6..a3088c00357 100755 --- a/regex/CMakeLists.txt +++ b/regex/CMakeLists.txt @@ -17,4 +17,9 @@ 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(regex debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c) + +SET(REGEX_SOURCES debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c) + +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(regex ${REGEX_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) |