summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorjbruehe/mysqldev@mysql.com/production.mysql.com <>2007-08-16 18:21:47 +0200
committerjbruehe/mysqldev@mysql.com/production.mysql.com <>2007-08-16 18:21:47 +0200
commit2d4efab3661f12e85b111c97a524b4d5e5b1b592 (patch)
tree9a62f903d57f431cf953e28060ff94f1b7cfc663 /regex
parentf07738caac5497de8c896670e9ea53dc5c1e5fbe (diff)
parent0e5e36421815d2c2bc67942362bebe3a2fba6b76 (diff)
downloadmariadb-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 'regex')
-rwxr-xr-xregex/CMakeLists.txt7
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)